gina 0.1.1-alpha.132 → 0.1.1-alpha.135

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/cmd/framework/tail.js

@@ -3,6 +3,9 @@ var os          = require("os");
 var util        = require('util');
 var net         = require('net');
 
+var EventEmitter    = require('events').EventEmitter;
+var e               = new EventEmitter();
+
 var CmdHelper       = require('./../helper');
 var console         = lib.logger;
 var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js', true) );
@@ -39,6 +42,16 @@ function Tail(opt, cmd) {
             tail(opt, cmd);
         });
 
+        // process.on('gina#container-writting', function onGinaStarted(hostV4, mqPort, type) {
+        //     console.info('[MQTail] Container resumed writting on  `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     opt.mqPort = mqPort;
+        //     console.resumeReporting()
+        //     tail(opt, cmd);
+        // });
+
+
+
+
         // if (!self.name) {
         //     status(opt, cmd, 0);
         // } else {
@@ -47,7 +60,7 @@ function Tail(opt, cmd) {
     }
 
 
-    var tail = function(opt, cmd) {
+    var tail = function(opt, cmd, isResuming) {
 
         var port = opt.mqPort || GINA_MQ_PORT || 8125;
         var host = opt.hostV4 || GINA_HOST_V4 || '127.0.0.1';
@@ -74,12 +87,17 @@ function Tail(opt, cmd) {
         }
 
 
+
+
+
         var client = net.createConnection(clientOptions, () => {
 
+            e.emit('gina#mqtail-started', true);
+
             // 'connect' listener.
             console.resumeReporting();
             // console.debug('[MQTail] connected with opt `'+ JSON.stringify(opt, null, 2) +'` :)');
-            console.info('[MQTail] connected to server `'+ host +'` on port `'+ port +'` :)');
+            console.info('[MQTail] Connected to server `'+ host +'` on port `'+ port +'` :)');
 
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
@@ -88,22 +106,22 @@ function Tail(opt, cmd) {
         client.on('error', (data) => {
             var err = data.toString();
             console.error('[MQTail] ' + err + ' - Gina might not be running');
-            console.info('[MQTail] waitting for `MQListener` to be started ...');
-
-            var mqPort = null;
-            nIntervId = setInterval(() => {
-                try {
-                    mqPort = ~~(fs.readFileSync(mqPortFile).toString());
-                    if (mqPort) {
-                        process.emit('gina#mqlistener-started', mqPort);
-                    }
-                } catch (fileErr) {}
-            }, 100);
+            console.info('[MQTail] Waitting for `MQListener` to be started ...');
+
+            // var mqPort = null;
+            // nIntervId = setInterval(() => {
+            //     try {
+            //         mqPort = ~~(fs.readFileSync(mqPortFile).toString());
+            //         if (mqPort) {
+            //             process.emit('gina#mqlistener-started', mqPort, host);
+            //         }
+            //     } catch (fileErr) {}
+            // }, 100);
         });
 
         var payloads = null, i = null;
         client.on('data', (data) => {
-            //console.log('[MQTail]  (data): ' + data.toString());
+            // console.log('[MQTail]  (data): ' + data.toString());
             payloads = data.toString();
 
             // from speakers & tail
@@ -122,7 +140,7 @@ function Tail(opt, cmd) {
                         try {
                             pl = JSON.parse(payload);
                         } catch(plErr) {
-                            process.stdout.write( '[MQTail] (exception) '+ payload +'\n' );
+                            process.stdout.write( '[MQTail] (Exception) '+ payload +'\n' );
                             continue;
                         }
 
@@ -147,10 +165,22 @@ function Tail(opt, cmd) {
                             continue;
                         }
 
+                        // resuming logging from another process
+                        // we do not want to print twice in this case since another logger server is already running
+                        // if (isResuming) {
+                        //     return
+                        // }
+
                         // only for debug
-                        //process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
+                        // process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
 
                         try {
+
+                            if ( /exiting(.*)SIGKILL/.test(pl.content) ) {
+                                client.destroy();
+                                return end()
+                            }
+
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
                         } catch (writeErr) {
                             // means that the related MQSpeaker is not connected yet
@@ -165,8 +195,8 @@ function Tail(opt, cmd) {
 
         });
         client.on('end', () => {
-            console.warn('[MQTail] disconnected from server');
-            console.info('[MQTail] waitting for `MQListener` to be started ...');
+            console.warn('[MQTail] Disconnected from server');
+            console.info('[MQTail] Waitting for `MQListener` to be started ...');
             var mqPort = null;
             nIntervId = setInterval(() => {
                 try {
@@ -180,6 +210,19 @@ function Tail(opt, cmd) {
         // setInterval(() => {}, 1 << 30);
     }
 
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
 
     init(opt, cmd);
 }

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/cmd/helper.js

@@ -1,3 +1,4 @@
+const { execSync } = require('child_process');
 var fs          = require('fs');
 var console     = lib.logger;
 var merge       = lib.merge;
@@ -340,7 +341,7 @@ function CmdHelper(cmd, client, debug) {
                 }
             }
 
-            // only when adding a project
+            // Additional project checking & actions
             if (cmd.projectName != null) {
                 // valid name but not in projects and task != :add, :remove or :import
                 if ( typeof(cmd.projects[cmd.projectName]) == 'undefined' && !/\:(add|import|remove)$/.test(cmd.task) ) {
@@ -369,6 +370,20 @@ function CmdHelper(cmd, client, debug) {
             loadAssets();
             cmd.configured = true;
 
+            // linking gina
+            if (
+                cmd.projectName != null
+                && /^true$/i.test(GINA_GLOBAL_MODE)
+                && !/\:(link)$/.test(cmd.task)
+                && new _( GINA_HOMEDIR +'/'+ GINA_SHORT_VERSION +'/settings.json', true ).existsSync()
+            ) {
+                var err = execSync('gina link @'+cmd.projectName);
+                if (err instanceof Error) {
+                    console.error(err.message || err.stack);
+                    return exit(errMsg);
+                }
+            }
+
             return true; // completed configuration
 
         } catch (err) {

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/logger/src/containers/default/index.js

@@ -10,6 +10,18 @@ function DefaultContainer(opt, loggers) {
     var format          = loggerHelper.format;
 
     function init() {
+
+        // process.on('gina#bundle-started', function onBundleStarted(mqPort, hostV4, group) {
+        //     onPayload(true);
+        // });
+        // process.on('gina#container-writting', function onBundleStarted(mqPort, hostV4, group) {
+        //     console.debug('[MQDefault] resuming ...');
+        //     if (group) {
+        //         console.info('[MQTail] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     }
+        //     onPayload(true);
+        // });
+
         onPayload();
         // ----------------------------Debug---------------------------------------
         var level = 'debug';

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/logger/src/containers/file/index.js

@@ -8,26 +8,74 @@ const net                 = require('net');
 // const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 // const { execSync }      = require('child_process');
 
+var helpers = null;
 
-const merge = require(__dirname + '/../../../../merge');
+const merge     = require(__dirname + '/../../../../merge');
 
 function FileContainer(opt, loggers) {
     var self = {
         // flow or container name/id
         name: 'file'
     };
+
     var mqId = 'MQ'+ self.name.substring(0,1).toLocaleUpperCase() + self.name.substring(1);
 
-    //var defaultOptions = ;
+    helpers         = require(__dirname +'/../../../../../helpers');
+
 
     var loggerHelper    = require(__dirname +'/../../helper.js')(opt, loggers);
     var format          = loggerHelper.format;
     var processProperties = null;
     var filenames   = {};
 
-    function init() {
+    function init(opt) {
+
+        // ---------- BO - hack for early calls
+        var isWin32         = (process.platform === 'win32') ? true : false;
+        var binPath         = __dirname +'/../../../../../../../';
+        var ginaPath        = (binPath.replace(/\\/g, '/')).replace('/bin', '');
+        ginaPath = (isWin32) ? ginaPath.replace(/\//g, '\\') : ginaPath;
+        // loading pack
+        var pack            = ginaPath + '/package.json';
+        pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
+        var packObj         = require(pack);
+        var version         = packObj.version;// jshint ignore:line
+        // var frameworkPath   = ginaPath + '/framework/v' + version;
+
+
+        var shortVersion = version.split('.');
+        shortVersion.splice(2);
+        shortVersion = shortVersion.join('.');
+
+        var settings = { mq_port: 8125, host_v4: '127.0.0.1' };
+        try {
+            settings = require( getUserHome() + '/.gina/' + shortVersion + '/settings.json');
+        } catch (err) {}
+
+        opt.mqPort = settings.mq_port;
+        opt.hostV4 = settings.host_v4;
+        // ---------- EO - hack for early calls
+
+        // handle server not started yet or server exited
+        // process.on('gina#mqlistener-started', function onGinaStarted(mqPort, hostV4, group) {
+        //     if (group) {
+        //         console.info('[MQFile] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     }
+        //     clearInterval(nIntervId);
+        //     nIntervId = null;
+        //     onPayload({mqPort: mqPort, hostV4: hostV4});
+        // });
+
+        process.on('gina#bundle-logging', function onBundleStarted(mqPort, hostV4, group) {
+            console.debug('[MQFile] resuming ...')
+            if (group) {
+                console.info('[MQFile] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+            }
+            // only if tail not already running !! Or you will get duplicate logs
+            onPayload({mqPort: mqPort, hostV4: hostV4}, true);
+        });
 
-        onPayload();
+        onPayload(opt);
 
         // ----------------------------Debug---------------------------------------
         var level = 'debug';
@@ -77,8 +125,19 @@ function FileContainer(opt, loggers) {
         homeDir += '/.gina';
         var project = requireJSON(_(homeDir +'/projects.json', true))[projectName];// jshint ignore:line
         var projectPath = project.path;
-        console.info('write env: ', bundleName, process.env.NODE_ENV || getEnvVar('GINA_ENV'));// jshint ignore:line
-        var envObj      = requireJSON(_(projectPath +'/env.json', true))[bundleName][process.env.NODE_ENV || getEnvVar('GINA_ENV')];// jshint ignore:line
+        // console.debug('logger::file write env: ', bundleName, process.env.NODE_ENV, getEnvVar('GINA_ENV'), JSON.stringify(process.gina, null, 2) );// jshint ignore:line
+
+        var env         = process.env.NODE_ENV || getEnvVar('GINA_ENV');// jshint ignore:line
+        var Config      = require(getEnvVar('GINA_CORE') + '/config');
+        var conf = new Config({
+            env: env,
+            projectName: projectName,
+            executionPath: projectPath,
+            startingApp: bundleName,
+            ginaPath: getEnvVar('GINA_CORE')
+        }, true).getInstance(bundleName);
+
+        var envObj      = conf.envConf[bundleName][env];// jshint ignore:line
         var webroot     = ( !/\s+|\//.test(envObj.server && envObj.server.webroot) ) ? envObj.server.webroot +'.' : '';
         var hostname    = envObj.host;
         var logDir      = getLogDir() || getEnvVar('GINA_LOGDIR');// jshint ignore:line
@@ -88,7 +147,8 @@ function FileContainer(opt, loggers) {
         process.stdout.write( format(opt.name, 'info', 'Log group `'+ group +'` filename set to: ' + filenames[group].filename) );
     }
 
-    function onPayload() {
+    function onPayload(opt, isResuming) {
+        // console.debug('mqFile options: ', JSON.stringify(opt, null, 2));
         var port = opt.mqPort || getEnvVar('GINA_MQ_PORT') || 8125;// jshint ignore:line
         var host = opt.hostV4 || getEnvVar('GINA_HOST_V4') || '127.0.0.1';// jshint ignore:line
         var clientOptions = {
@@ -106,7 +166,7 @@ function FileContainer(opt, loggers) {
 
         var delayedMessages = [];
         var resume = function(payload) {
-            process.stdout.write('['+ mqId +'] Resuming with group: '+ payload.group);
+            // process.stdout.write('['+ mqId +'] Resuming with group: '+ payload.group);
             var i = 0;
             while (i < delayedMessages.length) {
                 let pl = delayedMessages[i];
@@ -120,22 +180,45 @@ function FileContainer(opt, loggers) {
         }
 
 
+
+
         var client = net.createConnection(clientOptions, () => {
             // 'connect' listener.
-            console.info('['+ mqId +'] connected to server :) ', process.argv);
+            console.info('['+ mqId +'] connected to server :) on host: '+ host + ' & port: '+ port, process.argv);
             processProperties = loggerHelper.getProcessProperties();
             console.info('['+ mqId +'] process properties ', processProperties);
+
+            process.emit('gina#container-writting', host, port);
+
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
 
         });
+
+
         client.on('error', (data) => {
             var err = data.toString();
             process.stdout.write( format(opt.name, 'warn', '['+ mqId +'] ' + err) );
+
+            // allowing the framework to quit properly
+            if ( /write EPIPE|read ECONNRESET|connect ECONNREFUSED/i.test(err) ) {
+                process.exit(0)
+            }
+
+            // var mqPort = null;
+            // nIntervId = setInterval(() => {
+            //     try {
+            //         mqPort = ~~(fs.readFileSync(mqPortFile).toString());
+            //         if (mqPort) {
+            //             process.emit('gina#mqlistener-started', mqPort, host);
+            //         }
+            //     } catch (fileErr) {}
+            // }, 100);
         });
 
         var payloads = null, i = null;
         client.on('data', (data) => {
+
             //console.log('['+ mqId +']  (data): ' + data.toString());
             payloads = data.toString();
 
@@ -187,6 +270,12 @@ function FileContainer(opt, loggers) {
                             continue;
                         }
 
+                        // resuming logging from another process
+                        // we do not want to print twice in this case since another logger server is already running
+                        if (isResuming) {
+                            return
+                        }
+
                         // only for debug
                         // process.stdout.write(  '['+ mqId +'] '+ pl.content +'\n' );
 
@@ -248,6 +337,6 @@ function FileContainer(opt, loggers) {
 
 
 
-    init();
+    init(opt);
 }
 module.exports = FileContainer;

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/logger/src/containers/mq/index.js

@@ -19,6 +19,7 @@ function MqContainer(opt, loggers) {
     var mqSpeaker       = new MQSpeaker(opt, loggers);
 
     function init() {
+
         onPayload()
 
         // ------------------------------------------------------------------------

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/lib/logger/src/containers/mq/speaker.js

@@ -14,6 +14,33 @@ function MQSpeaker(opt, loggers, cb) {
 
 
     function init(opt, cb) {
+
+        // ---------- BO - hack for early calls
+        var isWin32         = (process.platform === 'win32') ? true : false;
+        var binPath         = __dirname +'/../../../../../../../';
+        var ginaPath        = (binPath.replace(/\\/g, '/')).replace('/bin', '');
+        ginaPath = (isWin32) ? ginaPath.replace(/\//g, '\\') : ginaPath;
+        // loading pack
+        var pack            = ginaPath + '/package.json';
+        pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
+        var packObj         = require(pack);
+        var version         = packObj.version;// jshint ignore:line
+        // var frameworkPath   = ginaPath + '/framework/v' + version;
+
+
+        var shortVersion = version.split('.');
+        shortVersion.splice(2);
+        shortVersion = shortVersion.join('.');
+
+        var settings = { mq_port: 8125, host_v4: '127.0.0.1' };
+        try {
+            settings = require( getUserHome() + '/.gina/' + shortVersion + '/settings.json');
+        } catch (err) {}
+
+        opt.mqPort = settings.mq_port;
+        opt.hostV4 = settings.host_v4;
+        // ---------- EO - hack for early calls
+
         return startMQSpeaker(opt, cb);
     }
 
@@ -31,7 +58,7 @@ function MQSpeaker(opt, loggers, cb) {
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
 
-            console.info('[MQSpeaker] connected to server :) ');
+            console.info('[MQSpeaker] connected to server on host: '+ host +' & port: '+ port +' :) ');
 
             if (cb) {
                 cb(false, client)