gina 0.1.1-alpha.117 → 0.1.1-alpha.118

package/framework/{v0.1.1-alpha.117 → v0.1.1-alpha.118}/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.117 → v0.1.1-alpha.118}/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.117 → v0.1.1-alpha.118}/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, { port: 8125, host: '127.0.0.1' });
     var mqSpeaker       = new MQSpeaker(opt, loggers);
 
     function init() {

package/framework/{v0.1.1-alpha.117 → v0.1.1-alpha.118}/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.117 → v0.1.1-alpha.118}/lib/logger/src/containers/mq/speaker.js

@@ -19,9 +19,11 @@ function MQSpeaker(opt, loggers, cb) {
 
 
     function startMQSpeaker(opt, cb) {
-
+        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 = {
-            port    : opt.port,
+            host    : host,
+            port    : port,
             request : 'report'
         };
         var client = net.createConnection(clientOptions, () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.117",
+  "version": "0.1.1-alpha.118",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.117/core/gna",
+  "main": "./framework/v0.1.1-alpha.118/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/resources/home/settings.json

@@ -10,6 +10,9 @@
     "node_version": "{node_version}",
     "port": "{port}",
     "debug_port": "{debug_port}",
+    "mq_port": "{mq_port}",
+    "host_v4": "{host_v4}",
+    "hostname": "{hostname}",
     "user": "{user}",
     "uid": "{uid}",
     "gid": "{gid}",

package/utils/helper.js

@@ -611,10 +611,10 @@ function MainHelper(opt) {
             define(c, obj[c])
         }
         delete  obj
-    }
+    }// jshint ignore:line
 
     init(opt)
 
-};
+}
 
-module.exports = MainHelper()
+module.exports = MainHelper();

package/framework/v0.1.1-alpha.117/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.117