From e0c12450620042dfa2b0375dab4ddc0073fcdbc5 Mon Sep 17 00:00:00 2001
From: Zaid Abdulla <zaid@genieacs.com>
Date: Wed, 30 Nov 2016 21:52:48 -0800
Subject: [PATCH] Pass config to extensions as env vars

---
 lib/cluster.coffee | 9 ++-------
 lib/config.coffee  | 6 ++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/lib/cluster.coffee b/lib/cluster.coffee
index 581b559..9203177 100644
--- a/lib/cluster.coffee
+++ b/lib/cluster.coffee
@@ -19,11 +19,6 @@ config = require './config'
 cluster = require 'cluster'
 util = require 'util'
 
-# Keep current configuration to pass that to workers as environment variables
-ENVIRONMENT_VARIABLES = {}
-for k, v of config.allConfig
-  ENVIRONMENT_VARIABLES["GENIEACS_#{k}"] = v
-
 
 cluster.on('listening', (worker, address) ->
   util.log("Worker #{worker.process.pid} listening to #{address.address}:#{address.port}")
@@ -31,7 +26,7 @@ cluster.on('listening', (worker, address) ->
 
 cluster.on('exit', (worker, code, signal) ->
   util.log("Worker #{worker.process.pid} died (#{worker.process.exitCode})")
-  cluster.fork(ENVIRONMENT_VARIABLES)
+  cluster.fork()
 )
 
 
@@ -45,7 +40,7 @@ start = (service) ->
   })
 
   for [0 ... workerProcesses]
-    cluster.fork(ENVIRONMENT_VARIABLES)
+    cluster.fork()
 
 
 exports.start = start
diff --git a/lib/config.coffee b/lib/config.coffee
index 81d0400..7b927dd 100644
--- a/lib/config.coffee
+++ b/lib/config.coffee
@@ -100,7 +100,7 @@ setConfig = (name, value, commandLineArgument) ->
     if _value?
       allConfig[n] = _value
       # Save as environmnet variable to pass on to any child processes
-      process.env[n] = _value
+      process.env["GENIEACS_#{n}"] = _value
       return true
 
   return false
@@ -137,7 +137,9 @@ else
 
 # Configuration file
 for k, v of require(path.resolve(allConfig.CONFIG_DIR, 'config'))
-  setConfig(k, v)
+  if not setConfig(k, v)
+    # Pass as environment variable to be accessable by extensions
+    process.env["GENIEACS_#{k}"] = v
 
 
 # Defaults