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

package/README.md

@@ -282,8 +282,11 @@ Note that this is optional since logs are output like for other frameworks: you
 So to handle log storage for your application, you have 2 options: see 2nd & 3rd Methods.
 
 __2nd Method - Old school way__
+
+> __Attention: __ You will have to handle yourself [log rotation](https://linux.die.net/man/8/logrotate)
+
 ```tty
-gina bundle:start frontend @myproject > /usr/local/var/log/gina/frontend.myproject.domain.log 2>&1
+gina bundle:start frontend @myproject --log > /usr/local/var/log/gina/frontend.myproject.domain.log 2>&1
 ```
 You can now check
 ```tty

package/bin/cli

@@ -114,6 +114,7 @@ async function onExec() {
         setEnvVar('GINA_RUNDIR', settings['rundir']);// jshint ignore:line
         setEnvVar('GINA_LOGDIR', settings['logdir']);// jshint ignore:line
         setEnvVar('GINA_TMPDIR', settings['tmpdir']);// jshint ignore:line
+        setEnvVar('GINA_ENV', settings['env']);// jshint ignore:line
 
         // prior to what settings says
         if (hostname != settings['hostname'] && !isUpdateRequired) {
@@ -123,6 +124,12 @@ async function onExec() {
         hostV4 = getEnvVar('GINA_HOST_V4') || settings['host_v4'] || '127.0.0.1';// jshint ignore:line
         mqPort = getEnvVar('GINA_MQ_PORT')|| settings['mq_port'] || 8125;// jshint ignore:line
 
+        if (!isUpdateRequired) {
+            setEnvVar('GINA_HOST_V4', settings['host_v4']);// jshint ignore:line
+            setEnvVar('GINA_MQ_PORT', settings['mq_port']);// jshint ignore:line
+            setEnvVar('GINA_HOSTNAME', settings['hostname']);// jshint ignore:line
+        }
+
         if ( typeof(packObj.config) != 'undefined' ) {
             if (typeof(packObj.config.prefix) != 'undefined' ) {
                 setEnvVar('GINA_PREFIX', packObj.config.prefix);// jshint ignore:line
@@ -144,7 +151,6 @@ async function onExec() {
         if ( /(gina\/bin\/cli|gina\/\/bin\/gina)$/.test(process.argv[1]) ) {
 
             var MQListener = require(frameworkPath + '/lib/logger/src/containers/mq/listener.js');
-
             var mqListener = await new MQListener({ port: mqPort, host: hostV4 });
             // required for tail command
             var mqPortFile = getTmpDir() + '/mq-listener-v'+ version +'.port';// jshint ignore:line
@@ -179,12 +185,12 @@ async function onExec() {
     if (!home) {
         console.error('No ' + ((isWin32) ? 'USERPROFILE' : 'HOME') + ' path found.');
         process.exit(1);
-    } else {
-        setEnvVar('GINA_HOMEDIR', home);// jshint ignore:line
-        setEnvVar('GINA_DIR', ginaPath);// jshint ignore:line
-        setEnvVar('GINA_FRAMEWORK_DIR', frameworkPath);// jshint ignore:line
-        setEnvVar('GINA_CORE', frameworkPath + '/core');// jshint ignore:line
     }
+
+    // setEnvVar('GINA_HOMEDIR', home);// jshint ignore:line
+    setEnvVar('GINA_DIR', ginaPath);// jshint ignore:line
+    setEnvVar('GINA_FRAMEWORK_DIR', frameworkPath);// jshint ignore:line
+    setEnvVar('GINA_CORE', frameworkPath + '/core');// jshint ignore:line
     setEnvVar('GINA_IS_WIN32', isWin32, true);// jshint ignore:line
 
     if (!settings) {

package/bin/cmd

@@ -163,7 +163,7 @@ function Cmd(opt, runOffine) {
                 topic : topic,
                 action : action
             }
-        })
+        });
     };
 
     var checkIfSettings = function() {

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

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

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/core/config.js

@@ -33,14 +33,28 @@ var modelUtil       = new lib.Model();
  * TODO - split Config.Env & Config.Host
  */
 
-function Config(opt) {
+function Config(opt, contextResetNeeded) {
 
     var self = this;
+    if (
+        !Config.initialized
+        && typeof(contextResetNeeded) != 'undefined'
+        && /^true$/i.test(contextResetNeeded)
+    ) {
+        // requirements
+        setContext('env', opt.env);
+        setContext('projectName', opt.projectName || getContext('projectName'));
+        setContext('bundle', opt.startingApp);
+        // reset context
+        resetContext()
+    }
+
     // framework settings from homedir
+    var homedir = getEnvVar('GINA_HOMEDIR');
     var framework = {
-        ports : _( GINA_HOMEDIR +'/ports.json', true),
-        portsReverse : _( GINA_HOMEDIR +'/ports.reverse.json', true),
-        project : _( GINA_HOMEDIR +'/projects.json', true)
+        ports : _( homedir +'/ports.json', true),
+        portsReverse : _( homedir +'/ports.reverse.json', true),
+        project : _( homedir +'/projects.json', true)
     };
 
     this.bundles = [];
@@ -51,12 +65,12 @@ function Config(opt) {
      * Config Constructor
      * @constructor
      * */
-    var init =  function(opt) {
+    var init =  function(opt, contextResetNeeded) {
 
         if ( !Config.initialized) {
             var env = opt.env;
-
             self.projectName    = opt.projectName || getContext('projectName');
+
             self.startingApp    = opt.startingApp;
             self.executionPath  = opt.executionPath; // project path
 
@@ -66,7 +80,6 @@ function Config(opt) {
             var path = _(self.executionPath + '/env.json');
 
             if ( fs.existsSync(path) ) {
-
                 self.userConf = requireJSON(path);
                 console.debug('Application config file loaded [' + path + ']');
             }
@@ -80,6 +93,7 @@ function Config(opt) {
             //if yes, join in case of standalone.. or create a new thread.
             self.Host.setMaster(opt.startingApp);
 
+
             getConf(env)
         } else {
             if (!opt) {
@@ -90,6 +104,7 @@ function Config(opt) {
         }
     }
 
+
     var getConf = function(env) {
 
         self.env = env;
@@ -290,7 +305,7 @@ function Config(opt) {
      * @author      Rhinostone <contact@gina.io>
      */
     this.Env = {
-        template : requireJSON(GINA_FRAMEWORK_DIR +'/core/template/conf/env.json'),
+        template : requireJSON( getEnvVar('GINA_FRAMEWORK_DIR') +'/core/template/conf/env.json'),
         load : function(callback) {
             loadWithTemplate(this.parent.userConf, this.template, function(err, envConf) {
                 self.envConf            = envConf;
@@ -516,7 +531,7 @@ function Config(opt) {
         var version = null, middleware = null;
         try {
             self.version    = version = require(_(getPath('gina').root +'/package.json' )).version;
-            self.middleware = middleware = fs.readFileSync(_(GINA_FRAMEWORK_DIR + '/MIDDLEWARE')).toString() || 'none';
+            self.middleware = middleware = fs.readFileSync(_( getEnvVar('GINA_FRAMEWORK_DIR') + '/MIDDLEWARE')).toString() || 'none';
 
             setContext('gina.version', version);
             setContext('gina.middleware', middleware);
@@ -671,7 +686,7 @@ function Config(opt) {
                 bundleSettings.tmpSettingFileContent = JSON.clone(bundleSettings);
                 newContent[app][env] = merge(bundleSettings, newContent[app][env]);
                 // completing with missing props
-                var defaultSettings = requireJSON(GINA_FRAMEWORK_DIR +'/core/template/conf/settings.json');
+                var defaultSettings = requireJSON( getEnvVar('GINA_FRAMEWORK_DIR') +'/core/template/conf/settings.json');
                 newContent[app][env] = merge(newContent[app][env], defaultSettings);
 
 
@@ -802,7 +817,7 @@ function Config(opt) {
                 //Constants to be exposed in configuration files.
                 //Variables replace. Compare with gina/core/template/conf/env.json.
                 let reps = {
-                    "frameworkDir"  : GINA_FRAMEWORK_DIR,
+                    "frameworkDir"  : getEnvVar('GINA_FRAMEWORK_DIR'),
                     "executionPath" : root,
                     "projectPath"   : projectPath,
                     "bundlesPath" : appsPath,
@@ -1490,7 +1505,7 @@ function Config(opt) {
         //Constants to be exposed in configuration files.
         var reps = {
             "gina"              : getPath('gina').root,
-            "frameworkDir"      : GINA_FRAMEWORK_DIR,
+            "frameworkDir"      : getEnvVar('GINA_FRAMEWORK_DIR'),
             "scope"             : conf[bundle][env].server.scope,
             "host"             : conf[bundle][env].host,
             "env"               : env,
@@ -2298,7 +2313,7 @@ function Config(opt) {
             return self
         };
 
-        init(opt)
+        init(opt, contextResetNeeded)
     }
 
     return this

package/framework/{v0.1.1-alpha.132 → v0.1.1-alpha.135}/core/server.js

@@ -2159,6 +2159,7 @@ function Server(options) {
         self.instance.listen(self.conf[self.appName][self.env].server.port);//By Default 3100
         self.instance.timeout = (1000 * 300); // e.g.: 1000x60 => 60 sec
 
+
         self.emit('started', self.conf[self.appName][self.env], true);
     }