Add in separate config reader, nicer for no.de.

basho · Mar 12, 2011 · 8b5598c · 8b5598c
1 parent d988ade
commit 8b5598c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/config/config.js b/config/config.js
@@ -0,0 +1,11 @@
+var fs = require('fs');
+var configFile = {};
+
+if (process.env['RIAK_CONFIG'] != null) {
+  configFile = process.env['RIAK_CONFIG'];
+} else {
+  configFile = __dirname + "/riak.js";
+}
+
+var config = require(configFile);
+module.exports = config;
diff --git a/lib/syslog-server.js b/lib/syslog-server.js
@@ -1,5 +1,5 @@
 // Require needed libraries and config
-var config = require("../config/riak.js"),
+var config = require("../config/config.js"),
 syslogParser = require('glossy').Parse,
 dgram = require('dgram'),
 riak = require('riak-js'),

diff --git a/lib/web/server.js b/lib/web/server.js
@@ -1,6 +1,6 @@
 var express = require('express'),
     connect = require('connect'),
-    config = require("../../config/riak.js"),
+    config = require("../../config/config.js"),
     riak = require('riak-js').getClient(config);
 
 var app = express.createServer();