FD3-333 Se eliminan commands viejos. Command make:install updated

statsd/command/mongodelete.js

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-var cli = require('cli'), 
-    options = cli.parse({
-        leave: ['l', 'Period of time', 'string', '1d'],
-        name: ['n', 'MongoDb database name', 'string', 'statsd'],
-        host: ['h', 'MongoDb host', 'string', 'mongodb'],
-	port: ['p', 'MongoDb port', 'string', '27017']
-    })
-;
-
-var mongo = require('mongodb');
-
-var moment = require('moment');
-var n = parseInt(options.leave, 10);
-var from = moment().subtract(n, options.leave.replace(n, '')).format('X');
-var to = moment().format('X');
-
-mongo.connect("mongodb://" + options.host + ":" + options.port + "/" + options.name, function (err, db) {
-    if (err) {
-        db.close();
-        console.log(err);
-        throw err;
-    }
-    db.listCollections().toArray(function(err, collInfos) {
-        if (err) {
-            db.close();
-            console.log(err);
-            throw err;
-        }
-        for (var i = 0; i < collInfos.length; i++) {
-            console.log('db.collection('+collInfos[i].name+').remove({ time: { $lte: '+from+', $gte: '+to+' } })');
-            db.collection(""+collInfos[i].name).remove({ time: { $lte: from, $gte: to } });
-        }
-        db.close();
-    });
-});
-
-console.log('OK');

statsd/command/mysqldelete.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-
-var cli = require('cli'), 
-    options = cli.parse({
-        leave: ['l', 'Period of time', 'string', '1d'],
-        host: ['h', 'MySQL host', 'string', 'mysql'],
-        port: ['p', 'MySQL port', 'string', '3306'],
-	user: ['u', 'MySQL user', 'string', 'root'],
-	password: ['pw', 'MySQL password', 'string', '235r2342gtfsw'],
-	database: ['d', 'MySQL database', 'string', 'statsd_db']
-    })
-;
-
-var mysql = require('mysql');
-var connection = mysql.createConnection({
-    host: options.host,
-    port: options.port,
-    user: options.user,
-    password: options.password,
-    database: options.database,
-    multipleStatements: true
-});
-
-var moment = require('moment');
-var n = parseInt(options.leave, 10);
-var from = moment().subtract(n, options.leave.replace(n, '')).format('X');
-var to = moment().format('X');
-
-var mysql_tables = ['gauges_statistics', 'counters_statistics', 'timers_statistics', 'sets_statistics'];
-for (var i = 0; i < mysql_tables.length; i++) {
-    console.log('DELETE FROM '+mysql_tables[i]+' WHERE timestamp <= '+from+' OR timestamp >= '+to+';');
-    
-    connection.query('DELETE FROM '+mysql_tables[i]+' WHERE timestamp <= '+from+' OR timestamp >= '+to+';', function (err, rows, fields) {
-        if (err) {
-            connection.end();
-            console.log(err);
-            throw err;
-        }
-        for (var i = 0; i <= rows.length - 1; i++) {
-            console.log(rows[i]);
-        }
-    });
-}
-connection.end();
-
-console.log('OK');

tools/src/Release.php

@@ -390,6 +390,31 @@ inventory=inventory.ini
 	;
     }
 
+<<<<<<< Updated upstream
+=======
+    /**
+    * @param \Docker\Composer\FileFormat2 $composer
+    * @param array $config
+    * @param string $flavor
+    */
+    public function addSupervisord($composer, $config = array(), $flavor = "dev")
+    {
+        $version = "latest";
+        extract($config);
+
+        $composer->addService("supervisord")->build("./extra/supervisord")
+            ->image($registry."fd3/supervisord:$version")
+            ->privileged(true)
+            ->restart("always")
+            ->addLinks("mongodb")
+            ->addLinks("mysql")
+            ->addVolumes("./extra/supervisord/", "/etc/supervisord/")
+            ->addVolumes("./extra/supervisord/var/", "/var/log/supervisor/")
+            ->addVolumes("./extra/supervisord/sshd_config", "/etc/ssh/sshd_config")
+            ->addVolumes("./extra/supervisord/bin/fiberhome", "/usr/bin/fiberhome")
+            ->addVolumes("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink");
+    }
+>>>>>>> Stashed changes
 
     function addMySql($composer, $config = array(), $flavor = "dev"){
 	$version = "latest";