minor fixes

Author: iliakan

modules/config/index.js

@@ -1,36 +1,56 @@
 if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'development';
 }
+
 Error.stackTraceLimit = 1000;
 
 if (process.env.NODE_ENV == 'development' && process.env.DEV_TRACE) {
   // @see https://github.com/AndreasMadsen/trace
   // does not work now (buggy?)
 
-  Error.stackTraceLimit = Infinity;
   require('trace'); // active long stack trace
+  //require('clarify');
+
+  var csvPath = require('path').resolve(__dirname, 'worker-benchmark.csv');
+  var out = require('fs').createWriteStream(csvPath);
+
+  setInterval(function() {
+    var time = Date.now();
+    var memo = process.memoryUsage();
+    out.write(
+      time + ',' +
+      memo.rss + ', ' +
+      memo.heapTotal + ', ' +
+      memo.heapUsed + '\n'
+    );
+  }, 200);
   //require('clarify'); // Exclude node internal calls from the stack
 }
 
 require('lib/debug');
 
 var path = require('path');
 var fs = require('fs');
+var _ = require('lodash');
 
 var secretDir = path.join(process.cwd(), '../secret');
 
+module.exports = {
+  "port": process.env.PORT || 3000,
+  "host": process.env.HOST || '0.0.0.0',
+  "siteHost": process.env.SITE_HOST || "",
+  "staticHost": process.env.STATIC_HOST || ""
+};
+
+
 var secret;
 if (fs.existsSync(path.join(secretDir, 'secret.js'))) {
-  secret = require(path.join(secretDir, 'secret'));
+  secret = require(path.join(secretDir, 'secret'))(module.exports);
 } else {
   secret = require('./secret.template');
 }
 
-module.exports = {
-  "port":      process.env.PORT || 3000,
-  "host":      process.env.HOST || '0.0.0.0',
-  "siteHost":   process.env.SITE_HOST || "",
-  "staticHost": process.env.STATIC_HOST || "",
+_.assign(module.exports, {
 //  "siteHost":   "http://127.0.0.1:3000",
   "mongoose":  {
     "uri":     "mongodb://localhost/" + (process.env.NODE_ENV == 'test' ? "js_test" : "js"),
@@ -71,4 +91,4 @@ module.exports = {
   },
   projectRoot: process.cwd(),
   publicRoot:  path.join(process.cwd(), 'public')
-};
+});

modules/setup/render.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const moment = require('moment');
-const Parser = require('jade').Parser;
 const util = require('util');
 const path = require('path');
 const config = require('config');
@@ -36,7 +35,7 @@ function addStandardHelpers(locals, ctx) {
   // when I use a variable in jade, it's code analyzer (addWith, "with" module)
   // detects the variable and uses it in the wrapping function, effectively triggering it's evaluation
   // so I assign getter not to "csrf", but to "csrf.token", which will only be asked by "csrf.token", not a wrapper
-  Object.defineProperty(locals, "csrf", {
+  locals.csrf = {
     token: {
       get: function() {
         if (!ctx.req.user) {
@@ -51,7 +50,7 @@ function addStandardHelpers(locals, ctx) {
         return csrf;
       }
     }
-  });
+  };
 
   // we don't use defer in sessions, so can assign it
   // (simpler, need to call yield this.session)

modules/setup/requestLog.js

@@ -6,7 +6,7 @@ module.exports = function(app) {
     this.log = app.log.child({
       reqId: this.reqId
     });
-    this.req.log = this.log; // passport.js strategy passes req around
+    this.request.log = this.log; // passport.js strategy passes req around
 
     yield next;
   });

package.json

@@ -98,7 +98,7 @@
     "path-to-regexp": "*",
     "prismjs": "git://github.com/LeaVerou/prism#gh-pages",
     "request": "*",
-    "sanitize-html": "^1.3.0",
+    "sanitize-html": "*",
     "send": "*",
     "stylus": "*",
     "svgutils": "*",