Merge branch 'master' into one-redis-mpool

2014-10-14 18:23:17 +02:00
parent 3dad6e96e3 30dd0604ca
commit 711c1a89ee
10 changed files with 1065 additions and 409 deletions
@@ -38,6 +38,10 @@ log4js_config = {
  replaceConsole:true
 };

+if (global.environment.uv_threadpool_size) {
+    process.env.UV_THREADPOOL_SIZE = global.environment.uv_threadpool_size;
+}
+
 if ( global.environment.log_filename ) {
  var logdir = path.dirname(global.environment.log_filename);
  // See cwd inlog4js.configure call below