gina 0.1.1-alpha.123 → 0.1.1-alpha.124

package/framework/{v0.1.1-alpha.123 → v0.1.1-alpha.124}/lib/cmd/view/add.js

@@ -18,13 +18,13 @@ function Add(opt, cmd) {
     ;
 
     var init = function() {
-        
+
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         if ( isDefined('project', self.projectName) && self.bundles.length > 0) {
 
             addViews(0)
@@ -57,8 +57,8 @@ function Add(opt, cmd) {
             , f = 0;
 
         if (source == local.source && typeof(list) == 'undefined') {//root
-            var list = [];// root list
-            for (var l=0; l<files.length; ++l) {
+            list = [];// root list
+            for (let l=0; l<files.length; ++l) {
                 list[l] = _(local.source +'/'+ files[l])
             }
         }
@@ -132,6 +132,28 @@ function Add(opt, cmd) {
         }
     }
 
+    // var checkForNamespaces = function(src) {
+    //     var routingObj = null
+    //         , namespaces = {}
+    //     ;
+    //     try {
+    //         routingObj = require(_(src + '/config/routing.json', true));
+    //         // Looking for namespaces
+    //         for (let r in routing) {
+    //             if ( typeof(routing[r].namespace) != 'undefined' ) {
+    //                 namespaces[r] = {
+    //                     namespace : routing[r].namespace
+    //                 }
+    //             }
+    //         }
+    //     } catch (err) {
+    //         console.error(err.stack);
+    //         process.exit(1);
+    //     }
+
+    //     return (namespaces.count() > 0) ? namespaces : null
+    // }
+
     /**
      * Add bundles
      *
@@ -157,10 +179,13 @@ function Add(opt, cmd) {
             local.b         = b;
             local.env       = self.projects[self.projectName]['def_env'];
             local.root      = self.projects[self.projectName].path;
+            local.src       = _(self.bundlesLocation +'/'+ bundle, true);
 
             console.info('Adding view folder for: '+ local.bundle +'@'+ self.projectName);
-            
-            local.src = _(self.bundlesLocation +'/'+ bundle, true);
+
+            // local.namespaces = checkForNamespaces(local.src);
+
+
             addConfFile()
 
         } else {
@@ -182,7 +207,7 @@ function Add(opt, cmd) {
         var folder  = _(local.src + '/templates');
 
         if ( fs.existsSync(target) || fs.existsSync(folder) ) {
-            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > ');
+            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > \n');
             rl.prompt();
 
             rl.on('line', function(line) {
@@ -245,7 +270,7 @@ function Add(opt, cmd) {
             local.source        = _(targetPath +'/handlers', true);
             local.isInstalled   = false;
             browse(local.source);
-            
+
             console.log('['+ local.bundle +'@'+ self.projectName +'] templates installed with success !');
             folderPublic.cp(target + '/public', function(err, targetPath){
                 if (err) {
@@ -256,7 +281,7 @@ function Add(opt, cmd) {
                 ++local.b;
                 addViews(local.b)
             });
-            
+
         });
     }
 

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

@@ -1,7 +1,5 @@
 'use strict';
 // Imports
-// const fs                  = require('fs');
-// const util                = require('util');
 
 function DefaultContainer(opt, loggers) {
     var self = {

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

@@ -75,22 +75,24 @@ function FileContainer(opt, loggers) {
         var projectName = bfnArr[1];
         var homeDir = getUserHome() || process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];// jshint ignore:line
         homeDir += '/.gina';
-        var project = requireJSON(_(homeDir +'/projects.json', true))[projectName];
+        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'));
-        var envObj      = requireJSON(_(projectPath +'/env.json', true))[bundleName][process.env.NODE_ENV || getEnvVar('GINA_ENV')]
+        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
         var webroot     = ( !/\s+|\//.test(envObj.server && envObj.server.webroot) ) ? envObj.server.webroot +'.' : '';
         var hostname    = envObj.host;
-        var logDir      = getLogDir() || getEnvVar('GINA_LOGDIR');
+        var logDir      = getLogDir() || getEnvVar('GINA_LOGDIR');// jshint ignore:line
 
-        filenames[group].filename = _(logDir +'/'+ webroot + hostname +'.log', true);
+        filenames[group].filename = _(logDir +'/'+ webroot + hostname +'.log', true);// jshint ignore:line
         console.debug('Log group `'+ group +'` filename set to: ' + filenames[group].filename);
         process.stdout.write( format(opt.name, 'info', 'Log group `'+ group +'` filename set to: ' + filenames[group].filename) );
     }
 
     function onPayload() {
-        var port = 8125;
+        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 = {
+            host    : host,
             port    : port,
             request : 'writeToFile'
         }

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

@@ -15,7 +15,7 @@ function MqContainer(opt, loggers) {
     // TODO - get options like the `port` from: ~/.gina/user/extensions/logger/{container}/config.json
 
     var MQSpeaker       = require('./speaker.js');
-    opt = merge(opt, { port: 8125 });
+    opt = merge(opt, { mqPort: 8125, hostV4: '127.0.0.1' });
     var mqSpeaker       = new MQSpeaker(opt, loggers);
 
     function init() {

package/framework/{v0.1.1-alpha.123 → v0.1.1-alpha.124}/lib/logger/src/containers/mq/listener.js

@@ -15,23 +15,23 @@ function MQListener(opt, cb) {
     // will be in memory until the framework is stopped
     // TODO - remove specific `bundle` or `CLI` config when the process is terminated
     var sharedConfig    = { loggers: {}};
-    var homedir         = getEnvVar('GINA_HOMEDIR');
+    var homedir         = getEnvVar('GINA_HOMEDIR');// jshint ignore:line
     var isLoggedByFile  = false; // by default
     var fileLogsList    = {};
 
 
     function init(opt, cb) {
         setup();
-        return startMQListener(opt.port, cb);
+        return startMQListener(opt, cb);
     }
 
     function setup() {
-        var mainConfigPath  = _(homedir +'/user/extensions/logger/default/config.json', true);
-        if ( !new _(mainConfigPath, true).existsSync() ) {
+        var mainConfigPath  = _(homedir +'/user/extensions/logger/default/config.json', true);// jshint ignore:line
+        if ( !new _(mainConfigPath, true).existsSync() ) {// jshint ignore:line
             //throw new Error('Required file not found: '+ mainConfigPath);
             return;
         }
-        var mainConfig = requireJSON(mainConfigPath);
+        var mainConfig = requireJSON(mainConfigPath);// jshint ignore:line
         if ( mainConfig.flows.indexOf('file') > -1 ) {
             isLoggedByFile = true;
         }
@@ -64,8 +64,8 @@ function MQListener(opt, cb) {
             file = name;
         }
         file += '.log';
-        var filename = _(GINA_LOGDIR +'/'+ file);
-        var filenameObj = new _(filename);
+        var filename = _(GINA_LOGDIR +'/'+ file);// jshint ignore:line
+        var filenameObj = new _(filename);// jshint ignore:line
         if ( !filenameObj.existsSync() ) {
             // create an empty file
             try {
@@ -81,10 +81,10 @@ function MQListener(opt, cb) {
             compress: true,
             count: 3
         };
-        var rotatorOptionsPath = _(homedir +'/user/extensions/logger/file/config.json', true);
-        if ( new _(rotatorOptionsPath).existsSync() ) {
+        var rotatorOptionsPath = _(homedir +'/user/extensions/logger/file/config.json', true);// jshint ignore:line
+        if ( new _(rotatorOptionsPath).existsSync() ) {// jshint ignore:line
             try {
-                rotatorOptions = merge( requireJSON(rotatorOptionsPath).logrotator, rotatorOptions );
+                rotatorOptions = merge( requireJSON(rotatorOptionsPath).logrotator, rotatorOptions );// jshint ignore:line
             } catch (userConfigErr) {
                 throw userConfigErr
             }
@@ -149,7 +149,9 @@ function MQListener(opt, cb) {
         sessions[sessionId].write( JSON.stringify(payload) +'\r\n');
     }
 
-    function startMQListener(port, cb) {
+    function startMQListener(opt, cb) {
+        var port = opt.port;
+        var host = opt.hostV4;
         // AbortController is a global object
         const controller = new AbortController();// jshint ignore:line
         var server = net.createServer( function(conn) {//'connection' listener
@@ -264,7 +266,7 @@ function MQListener(opt, cb) {
 
         server.on('error', function(err) {
             if (err.code === 'EADDRINUSE') {
-                console.warn('[MQListener] is already running on port [ '+ (err.port || port) +' ]');
+                console.warn('[MQListener] `'+ host +'` is already running on port [ '+ (err.port || port) +' ]');// jshint ignore:line
             } else {
                 console.emerg('[MQListener] Could not start', err.stack)
             }
@@ -283,12 +285,12 @@ function MQListener(opt, cb) {
         });
 
         server.listen({
-            host: '127.0.0.1',
+            host: host,
             port: port,
             signal: controller.signal
           }, function() {
             // Server started.
-            console.info('[MQListener] is waitting for speakers on port `'+ port +'`');
+            console.info('[MQListener] `'+ host +'`is waitting for speakers on port `'+ port +'`');
             if (cb) {
                 cb(false);
             }

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

@@ -19,9 +19,11 @@ function MQSpeaker(opt, loggers, cb) {
 
 
     function startMQSpeaker(opt, cb) {
-
+        var port = opt.mqPort || 8125;// jshint ignore:line
+        var host = opt.hostV4 || '127.0.0.1';// jshint ignore:line
         var clientOptions = {
-            port    : opt.port,
+            host    : host,
+            port    : port,
             request : 'report'
         };
         var client = net.createConnection(clientOptions, () => {

package/framework/{v0.1.1-alpha.123 → v0.1.1-alpha.124}/lib/proc.js

@@ -93,7 +93,7 @@ function Proc(bundle, proc, usePidFile){
         return (self.master) ? true : false;
     };
 
-    
+
     /**
      * Going to force restart by third party (kill 9).
      *
@@ -121,7 +121,7 @@ function Proc(bundle, proc, usePidFile){
             console.debug('[ PROC ] Bundle [ '+ bundle +' ] already running or [ '+env+' ] port is use by another process');
             dismiss(process.pid);
         }
-        
+
         callback(false);
     };
 
@@ -141,13 +141,13 @@ function Proc(bundle, proc, usePidFile){
 
 
         if ( typeof(PID) != 'undefined' && typeof(PID) == 'number' ) {
-            
+
             console.debug('[ PROC ] Setting listeners for ', PID, ':', bundle);
 
             proc.dismiss = dismiss;
             proc.isMaster = isMaster;
 
-                        
+
             proc.on('SIGTERM', function(code){
                 if ( typeof(code) == 'undefined')
                     code = 0;
@@ -167,22 +167,28 @@ function Proc(bundle, proc, usePidFile){
 
             //Will prevent the server from stopping.
             proc.on('uncaughtException', function(err) {
-                
+
                 if ( /ERR\_HTTP\_HEADERS\_SENT/.test(err.stack) ) {
                     console.error('[ SERVER ][ HTTP UNCAUGHT EXCEPTION ]', err.stack);
                     return false;
                 }
-                
+
                 if ( /ERR\_HTTP2/.test(err.stack) ) {
                     console.warn('[ SERVER ][ HTTP2 UNCAUGHT EXCEPTION ]', err.stack);
                     return false;
                 }
-                
-                console.emerg('[ FRAMEWORK ][ uncaughtException ] ', err.stack);
 
                 //console.debug("[ PROC ] @=>", self.args);
                 var bundle = self.bundle;
                 var pid = self.getPidByBundleName(bundle);
+                // Do not dissmis the framework
+                if ( /^gina\-v/.test(bundle) ) {
+                    console.warn('[ FRAMEWORK ][ uncaughtException ] ', err.stack);
+                    return;
+                }
+
+                console.emerg('[ FRAMEWORK ][ uncaughtException ] ', err.stack);
+
 
                 dismiss(pid, 'SIGKILL');
 
@@ -204,19 +210,21 @@ function Proc(bundle, proc, usePidFile){
                 // var bundle = self.bundle;
                 // var env =  process.env.NODE_ENV || 'prod';
                 // var pid = self.getPidByBundleName(bundle);
-                
-                var currentProcess = process.list[process.list.count()-1];
-                if ( typeof(currentProcess) != 'undefined' ) {
-                    console.debug('Removing `currentProcess.pid`: ', currentProcess.pid);
-                    dismiss(currentProcess.pid, "SIGKILL")
-                }
+
+
+                // var currentProcess = process.list[process.list.count()-1];
+                // if ( typeof(currentProcess) != 'undefined' ) {
+                //     console.debug('Removing `currentProcess.pid`: ', currentProcess.pid);
+                //     dismiss(currentProcess.pid, "SIGKILL")
+                // }
+
+                dismiss(this.pid, "SIGKILL")
             });
 
             proc.on('SIGHUP', function(code){
                 console.debug('[ FRAMEWORK ] Hanging up ! Code: '+ code +'\n'+ process.argv);
 
                 var bundle = self.bundle;
-                // var env =  process.env.NODE_ENV || 'prod';
                 var pid = self.getPidByBundleName(bundle);
 
                 dismiss(process.pid, "SIGINT");
@@ -235,14 +243,14 @@ function Proc(bundle, proc, usePidFile){
         ;
         try {
             //console.debug('[ PROC ] => '+ JSON.stringify(process.list, null, 4));
-            
+
             for (let p in process.list) {
                 if ( typeof(process.list[p]) == 'undefined' || process.list[p] == null )
                     continue;
-                    
+
                 if ( process.list[p].pid == pid &&  !/^gina\-/.test(process.list[p].name) ) {
                     index       = p;
-                    
+
                     try {
                         removePidFileSync(process.list[p].pid);
                         if ( typeof(process.isMinion) == 'undefined' ) {
@@ -252,11 +260,11 @@ function Proc(bundle, proc, usePidFile){
                         }
                         // soft kill..
                         process.kill(pid, signal);
-                    } catch (err) {                        
+                    } catch (err) {
                         console.warn('[ PROC ] Could not unmount process file `'+process.list[p].name+'`\n'+ err.stack);
                     }
-                    
-                    
+
+
                 } else if ( process.list[p].pid == pid && /^gina\-/.test(process.list[p].name) ) {
                     index       = p;
                     removePidFileSync(process.list[p].pid);
@@ -271,20 +279,28 @@ function Proc(bundle, proc, usePidFile){
         if (index != null)
             delete process.list[index];
 
+        console.debug('[ PROC ] Received '+ signal +' signal to end process [ '+ pid +' ]');
         // handles only signals that cannot be cannot be caught or ignored
         if ( /(SIGKILL|SIGSTOP)/i.test(signal) ) {
             removePidFileSync(pid);
+            // should now exit for real
+            // if ( /^gina\-/.test(process.list[p].name) || self.bundles.indexOf(process.list[p].name) < 0 ) {
+                process.kill(pid, 'SIGTERM');
+                // process.exit(0)
+            // }
         }
-
-        console.debug('[ PROC ] Received '+ signal +' signal to end process [ '+ pid +' ]');
     };
-    
+
     var removePidFileSync = function(pid) {
         var files = fs.readdirSync( GINA_RUNDIR );
         var pidPath = null;
         for ( let i=0, len=files.length; i<len; i++) {
+            let file = files[i];
+            if (!/\.pid$/.test(file)) {
+                continue;
+            }
             let id = fs.readFileSync( _(GINA_RUNDIR +'/'+ files[i], true) ).toString().trim();
-            if (id == pid) {
+            if (~~id == pid) {
                 pidPath = _(GINA_RUNDIR +'/'+ files[i], true);
                 break;
             }
@@ -321,7 +337,7 @@ function Proc(bundle, proc, usePidFile){
                 //     e.emit('proc#registered', file);
                 // }
                 file += '.pid';
-                
+
                 console.debug('[ PROC ] Now saving `'+file+'`');
                 var fileStream = fs.createWriteStream(path + file);
                 fileStream.once('open', function(fd) {
@@ -338,20 +354,20 @@ function Proc(bundle, proc, usePidFile){
             e.emit('proc#complete-'+self.PID, new Error('encountered troubles while trying to save Process [ '+ proc.title +' ] pid file'))
         }
     };
-    
+
     var saveRunningProc = function(bundle) {
-        
+
         var runningProcsPath = _(GINA_HOMEDIR + '/procs.json', true)
             , runningProcsPathObj = new _(runningProcsPath)
             , runningProcs = {}
             , proc  = self.proc
-            , PID   = self.PID 
+            , PID   = self.PID
         ;
-        
+
         if ( runningProcsPathObj.existsSync() ) {
             runningProcs = requireJSON(runningProcsPath);
         }
-        
+
         if ( typeof(runningProcs[bundle]) == 'undefined' ) {
             runningProcs[bundle] = {}
         }
@@ -359,15 +375,15 @@ function Proc(bundle, proc, usePidFile){
         runningProcs[bundle].title      = proc.title;
         runningProcs[bundle].version    = GINA_VERSION;
         runningProcs[bundle].port       = ~~GINA_PORT;
-        
+
         var argvStr = process.argv.join(',');
         if ( /\-\-fake\-daemon\-pid/.test(argvStr) ) {
             runningProcs[bundle].fakeDaemonPid = ~~(argvStr.match(/\-\-fake\-daemon\-pid\=\d+/)[0].split(/\=/)[1])
         }
-        
+
         generator.createFileFromDataSync( JSON.stringify(runningProcs, null, 2), runningProcsPath);
     }
-    
+
     var removeRunningProc = function(pid) {
         var runningProcsPath = _(GINA_HOMEDIR + '/procs.json', true)
             , runningProcsPathObj = new _(runningProcsPath)
@@ -433,7 +449,7 @@ function Proc(bundle, proc, usePidFile){
     };
 
     self.register = function(bundle, pid) {
-        
+
         var processCollection = new Collection(process.list);
         var existingProcess = processCollection.findOne({ name: bundle, pid: pid });
         // cleanup if found;
@@ -443,8 +459,8 @@ function Proc(bundle, proc, usePidFile){
             console.debug('[ PROC ] Don\'t pannic ...');
             existingProcess = null;
         }
-        
-        
+
+
         if ( /^gina\-/.test(bundle) || !/^gina\-/.test(bundle) && self.bundles.indexOf(bundle) < 0 ) {
             console.debug('[ PROC ] Now registering `'+bundle+'` with PID `'+ pid +'`');
             var list = {};
@@ -458,7 +474,7 @@ function Proc(bundle, proc, usePidFile){
                 else if (/^gina\-/.test(bundle)) {
                     saveRunningProc(bundle)
                 }
-                
+
                 list['pid']     = pid;
                 list['name']    = bundle;
                 process.list.push(list);//Running bundles.
@@ -466,10 +482,10 @@ function Proc(bundle, proc, usePidFile){
                 process.pids[bundle] = pid;
 
                 list = null;
-                
+
                 //isBundleMounted(projects, bundlesPath, getContext('bundle'));
             };
-            
+
             var isReplacementNeeded = false, path = _(pathObj.toUnixStyle(), true);
             if ( self.usePidFile && !pathObj.existsSync() ) {
                 try {
@@ -481,7 +497,7 @@ function Proc(bundle, proc, usePidFile){
                 }
             }
 
-            if (self.usePidFile) {                
+            if (self.usePidFile) {
                 // save file
                 if (!isReplacementNeeded) {
                     self.PID    = self.proc.pid;
@@ -492,7 +508,7 @@ function Proc(bundle, proc, usePidFile){
                     save(bundle, self.PID, self.proc);
                 }
             }
-            
+
             processRegistration()
         }
     };