fix require() of system modules

olegp · Sep 27, 2013 · 544de40 · 544de40
1 parent 435bf55
commit 544de40
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/run.js b/lib/run.js
@@ -73,15 +73,19 @@ var run = module.exports = function(main) {
  if (module.app) {
  var httpserver = require('./httpserver');
  if (!httpserver.started) {
- httpserver.main(module.app, argv[2], {cluster: argv[3]});
+ httpserver.main(module.app, argv[2], {cluster:argv[3]});
  }
  }
  }
  });
  } else {
  var system = require('./system');
  require = function(name) {
- return proto.require.call(this, path.resolve(process.cwd(), name));
+ try {
+ return proto.require.call(this, name);
+ } catch (e) {
+ return protoRequire.call(this, path.resolve(process.cwd(), name));
+ }
  };
  var line;
  spawn(function() {