web-app-runner - npm Package Compare versions

Comparing version 0.90.32 to 0.90.33

bin/conf.js

@@ -8,3 +8,4 @@ /**
 
-var Logger = require('simple-node-logger' );
+var Logger = require('simple-node-logger' ),
+    port = 3005;
 
@@ -15,9 +16,19 @@ module.exports.readConfig = function() {
         env:'staging',
-        port:3005,
+        port:port,
         daemon:true
     };
 
-    var file = [ process.env.HOME, '/logs/staging-', config.port, '.log' ].join('');
-    config.log = Logger.createSimpleFileLogger( file );
+    return config;
+};
 
+module.exports.readLoggerConfig = function() {
+    // define a rolling logger
+    var config = {
+        logDirectory: process.env.HOME + '/logs',
+        fileNamePattern:[ 'staging-', port, '-<DATE>.log' ].join(''),
+        dateFormat:'YYYY.MM.DD',
+        level:'info',
+        refresh:2 // re-read this config each minutes
+    };
+
     return config;
@@ -24,0 +35,0 @@ };

lib/WebAppRunner.js

@@ -61,2 +61,6 @@ /**
         connection = app.listen( port );
+
+        connection.on('close', function() {
+            server.killme();
+        });
     };
@@ -114,2 +118,3 @@
                 process.nextTick( server.stop );
+                server.killme();
             });
@@ -172,2 +177,4 @@ } else {
             log.info('running child pid: ', child.pid);
+
+            server.killme();
         }
@@ -178,2 +185,10 @@
 
+    this.killme = function() {
+        log.info('killing pid: ', process.pid);
+
+        setTimeout(function() {
+            process.exit();
+        }, 100);
+    };
+
     this.__protected = function() {
@@ -200,3 +215,4 @@ return {
 
-    var runner,
+    var Logger = require('simple-node-logger' ),
+        runner,
         conf;
@@ -217,2 +233,7 @@
         }
+
+        if (typeof conf.readLoggerConfig === 'function') {
+            // determine if this is a rolling logger...
+            opts.log = Logger.createRollingFileLogger( conf.readLoggerConfig() );
+        }
     }
@@ -222,5 +243,5 @@
         if (opts.logfile) {
-            opts.log = require('simple-node-logger' ).createSimpleFileLogger( opts.logfile );
+            opts.log = Logger.createSimpleFileLogger( opts.logfile );
         } else {
-            opts.log = require('simple-node-logger' ).createSimpleLogger();
+            opts.log = Logger.createSimpleLogger();
         }
@@ -227,0 +248,0 @@ }

package.json

 {
   "name": "web-app-runner",
-  "version": "0.90.32",
+  "version": "0.90.33",
   "description": "A simple HTTP application server that accepts or rejects connections based on authenticated attributes including ip, user agent, etc.  The server can be used stand alone or as middleware for connect or express.",
@@ -22,3 +22,3 @@ "main": "./index.js",
     "serve-static": "^1.4.0",
-    "simple-node-logger": "^0.91.80"
+    "simple-node-logger": "^0.91.83"
   },
@@ -25,0 +25,0 @@ "devDependencies": {

README.md

@@ -211,2 +211,2 @@ # Web App Runner
 - - -
-<p><small><em>Copyright © 2014, rain city software | Version 0.90.32</em></small></p>
+<p><small><em>Copyright © 2014, rain city software | Version 0.90.33</em></small></p>

test/WebAppRunnerTests.js

@@ -49,2 +49,6 @@ /**
         };
+
+        this.on = function(type, fn) {
+            // simulate an event handler
+        };
     };
@@ -122,2 +126,3 @@
                 'stop',
+                'killme',
                 '__protected'
@@ -143,2 +148,3 @@ ];
         var server,
+            killed = false,
             opts = createOptions();
@@ -148,2 +154,5 @@
         server = new WebAppRunner( opts );
+        server.killme = function() {
+            killed = true;
+        };
 
@@ -159,4 +168,9 @@ it('should create a child instance and write the pid to process file', function() {
     describe('shutdown', function() {
-        var server = new WebAppRunner( createOptions() );
+        var server = new WebAppRunner( createOptions() ),
+            killed = false;
 
+        server.killme = function() {
+            killed = true;
+        };
+
         it('should reject a shutdown request from non-local host ip', function(done) {
@@ -208,2 +222,3 @@ var callback,
         var server,
+            killed = false,
             opts = createOptions();
@@ -215,2 +230,5 @@
         server = new WebAppRunner( opts );
+        server.killme = function() {
+            killed = true;
+        };
 
@@ -246,2 +264,3 @@ it('should close an open connection', function() {
         var server,
+            killed = false,
             opts = createOptions();
@@ -251,2 +270,5 @@
         server = new WebAppRunner( opts );
+        server.killme = function() {
+            killed = true;
+        };
 
@@ -253,0 +275,0 @@ it('should start a mock server', function() {

No alert changes

Improved metrics

Total package byte prevSize

58836

increased by2.23%

Lines of code

956

increased by5.05%

Dependency changes

• Updatedsimple-node-logger@^0.91.83