Merge cb3ca38 into 6107af7

lib/install.js

@@ -6,6 +6,11 @@ var _ = require('lodash');
 var assert = require('assert-plus');
 var vasync = require('vasync');
 var verror = require('verror');
+var compose = require('restify').helpers.compose;
+var bunyan = require('bunyan');
+var LOG = bunyan.createLogger({name: 'enroute'});
+
+
 
 /**
  * Install the enroute routes into the restify server.
@@ -32,6 +37,16 @@ function install(opts, cb) {
                 return cb1();
             });
 
+            if (process.env.HOT_RELOAD) {
+                if (typeof process.env.HOT_RELOAD_BASEDIR !== 'undefined') {
+                    LOG.info(
+                        'Hot reloading of routes is enabled for base dir'
+                            + process.env.HOT_RELOAD_BASEDIR);
+                } else {
+                    LOG.info('Hot reloading of routes is enabled.');
+                }
+            }
+
             // go through each of the route names
             _.forEach(opts.enroute.routes, function (methods, routeName) {
                 // go through each of the HTTP methods
@@ -45,7 +60,11 @@ function install(opts, cb) {
                         route = {
                             name: routeName,
                             method: method,
-                            func: require(sourceFile)
+                            func: process.env.HOT_RELOAD === 'true'
+                            ? function (req, resp, callback) {
+                                reloadProxy(sourceFile, req, resp, callback);
+                            }
+                            : require(sourceFile)
                         };
                     } catch (e) {
                         return cb1(new verror.VError({
@@ -89,4 +108,31 @@ function install(opts, cb) {
     });
 }
 
+function reloadProxy(sourceFile, req, resp, callback) {
+    if (typeof process.env.HOT_RELOAD_BASEDIR !== 'undefined') {
+        //Delete code loaded from a specific base dir
+        Object.keys(require.cache).forEach(function (cacheKey) {
+            if (cacheKey.indexOf(process.env.HOT_RELOAD_BASEDIR) !== -1) {
+                delete require.cache[cacheKey];
+            }
+        });
+    } else {
+        //Delete all cached entries
+        Object.keys(require.cache).forEach(function (cacheKey) {
+            delete require.cache[cacheKey];
+        });
+    }
+
+    try {
+        var handlers = require(sourceFile);
+        var handlerChain = compose(handlers);
+
+        handlerChain(req, resp, callback);
+    } catch (e) {
+        LOG.error('Uncaught error in route:');
+        LOG.error(e);
+        callback(e);
+    }
+}
+
 module.exports = install;

package.json

@@ -37,14 +37,15 @@
     "jscs": "^3.0.7",
     "mocha": "^3.1.2",
     "nsp": "^2.6.2",
-    "restify": "^7.0.0",
     "restify-clients": "^1.4.0",
     "uuid": "^2.0.3"
   },
   "dependencies": {
     "ajv": "^4.8.0",
     "assert-plus": "^1.0.0",
+    "bunyan": "^1.8.12",
     "lodash": "^4.16.4",
+    "restify": "^7.2.0",
     "vasync": "^1.6.4",
     "verror": "^1.6.0"
   }