diff --git a/README.md b/README.md index 5f6cc70..a2df23c 100644 --- a/README.md +++ b/README.md @@ -40,3 +40,9 @@ Then run the taiga events service ```bash coffee index.coffee ``` + +You can specify you own config path + +```bash + coffee index.coffee --config /path/to/config.json +``` diff --git a/events-config.coffee b/events-config.coffee new file mode 100644 index 0000000..7af5e10 --- /dev/null +++ b/events-config.coffee @@ -0,0 +1,8 @@ +path = require('path') + +config = {}; + +exports.config = null + +exports.loadConfigFile = (configPath) -> + exports.config = require(path.resolve(configPath)) diff --git a/index.coffee b/index.coffee index 0fc60ce..bbe9842 100644 --- a/index.coffee +++ b/index.coffee @@ -1,4 +1,10 @@ -config = require('./config') +eventsConfig = require('./events-config') +argv = require('minimist')(process.argv.slice(2)); + +eventsConfig.loadConfigFile(argv.config || './config') + +config = eventsConfig.config; + client = require('./client') WebSocketServer = require('ws').Server diff --git a/package.json b/package.json index 4cca5d4..a66a773 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "amqplib": "^0.5.1", "base64-url": "^1.2.1", "bluebird": "^2.9.10", + "minimist": "^1.2.0", "node-uuid": "^1.4.2", "ws": "^2.0.3" } diff --git a/rabbit.coffee b/rabbit.coffee index d065884..2299faa 100644 --- a/rabbit.coffee +++ b/rabbit.coffee @@ -1,6 +1,6 @@ amqp = require('amqplib') Promise = require('bluebird') -amqpUrl = require('./config').url +amqpUrl = require('./events-config').config.url config = { "exchange": { diff --git a/signing.coffee b/signing.coffee index a392355..941e179 100644 --- a/signing.coffee +++ b/signing.coffee @@ -1,6 +1,6 @@ crypto = require('crypto') base64url = require('base64-url') -config = require('./config') +config = require('./events-config').config salt = 'django.core.signing'