diff --git a/src/client.js b/src/client.js index 7cc339c..077a8cc 100644 --- a/src/client.js +++ b/src/client.js @@ -1,5 +1,4 @@ var _ = require("lodash"); -var config = require("../config"); var Chan = require("./models/chan"); var crypto = require("crypto"); var log = require("./log"); @@ -8,6 +7,8 @@ var Msg = require("./models/msg"); var Network = require("./models/network"); var slate = require("slate-irc"); var tls = require("tls"); +var Helper = require("./helper"); +var config = Helper.getConfig(); module.exports = Client; diff --git a/src/command-line/start.js b/src/command-line/start.js index 061dbbb..f936a27 100644 --- a/src/command-line/start.js +++ b/src/command-line/start.js @@ -1,7 +1,8 @@ -var config = require("../../config"); var ClientManager = new require("../clientManager"); var program = require("commander"); var shout = require("../server"); +var Helper = require("../helper"); +var config = Helper.getConfig(); program .option("-H, --host ", "host") diff --git a/src/log.js b/src/log.js index 2224da6..60af962 100644 --- a/src/log.js +++ b/src/log.js @@ -1,8 +1,8 @@ -var config = require("../config"); var fs = require("fs"); var mkdirp = require("mkdirp"); var moment = require("moment"); var Helper = require("./helper"); +var config = Helper.getConfig(); module.exports = { write: function(user, network, chan, msg) { diff --git a/src/server.js b/src/server.js index e580a52..139f8cd 100644 --- a/src/server.js +++ b/src/server.js @@ -2,11 +2,11 @@ var _ = require("lodash"); var bcrypt = require("bcrypt"); var Client = require("./client"); var ClientManager = require("./clientManager"); -var config = require("../config"); var express = require("express"); var fs = require("fs"); var io = require("socket.io"); var Helper = require("./helper"); +var config = Helper.getConfig(); var sockets = null; var manager = new ClientManager();