config/loggerConfig.js

@@ -2,7 +2,7 @@ const logger = require('winston');
 
 function LoggerConfig () {
   this.logLevel = 'debug';
-  this.configure = (config) => {
+  this.update = (config) => {
     if (!config) {
       return logger.warn('No logger config received.');
     }

config/mysqlConfig.js

@@ -4,7 +4,7 @@ function mysql () {
   this.database = 'default';
   this.username = 'default';
   this.password = 'default';
-  this.configure = (config) => {
+  this.update = (config) => {
     if (!config) {
       return logger.warn('No MySQL config received.');
     }

config/siteConfig.js

@@ -33,7 +33,7 @@ function SiteConfig () {
     thumbnailChannelId      : 'default',
     uploadDirectory         : '/home/lbry/Uploads',
   };
-  this.configure = (config) => {
+  this.update = (config) => {
     if (!config) {
       return logger.warn('No site config received.');
     }

config/slackConfig.js

@@ -5,7 +5,7 @@ function SlackConfig () {
   this.slackWebHook      = 'default';
   this.slackErrorChannel = 'default';
   this.slackInfoChannel  = 'default';
-  this.configure = (config) => {
+  this.update = (config) => {
     if (!config) {
       return winston.warn('No slack config received');
     }

server/index.js

@@ -9,30 +9,33 @@ const http = require('http');
 const logger = require('winston');
 const requestLogger = require('middleware/requestLogger.js');
 
+const loggerConfig = require('loggerConfig.js');
+const mysqlConfig = require('mysqlConfig.js');
+const siteConfig = require('siteConfig.js');
+const slackConfig = require('slackConfig.js');
+
 function Server () {
-  this.configureLogger = (loggerConfig) => {
+  this.configureLogger = (userConfig) => {
-    require('loggerConfig.js').configure(loggerConfig);
+    loggerConfig.update(userConfig);
-  }
-  this.configureMysql = (mysqlConfig) => {
-    require('mysqlConfig.js').configure(mysqlConfig);
   };
-  this.configureSiteDetails = (siteConfig) => {
+  this.configureMysql = (userConfig) => {
-    require('siteConfig.js').configure(siteConfig);
+    mysqlConfig.update(userConfig);
-    this.sessionKey = siteConfig.auth.sessionKey;
-    this.PORT = siteConfig.details.port;
   };
-  this.configureSlack = (slackConfig) => {
+  this.configureSiteDetails = (userConfig) => {
-    require('slackConfig.js').configure(slackConfig);
+    siteConfig.update(userConfig);
+  };
+  this.configureSlack = (userConfig) => {
+    slackConfig.update(userConfig);
   };
   this.configureClientBundle = () => {
-    logger.info('configure the client here by passing in the bundle and configuring it, or better yet: taking in the components to use dynamically from here.');
+    logger.debug('configure the client here by passing in the bundle and configuring it, or better yet: taking in the components to use dynamically from here.');
-  }
+  };
   this.configureModels = () => {
-    logger.info('here is where you could add/overwrite the default models')
+    logger.debug('here is where you could add/overwrite the default models')
-  }
+  };
   this.configureRoutes = () => {
-    logger.info('here is where you could add/overwrite the default routes')
+    logger.debug('here is where you could add/overwrite the default routes')
-  }
+  };
   this.createApp = () => {
     // create an Express application
     const app = express();
@@ -53,9 +56,10 @@ function Server () {
     // configure passport
     const speechPassport = require('speechPassport');
     // initialize passport
+    const sessionKey = siteConfig.auth.sessionKey;
     app.use(cookieSession({
       name  : 'session',
-      keys  : [this.sessionKey],
+      keys  : [sessionKey],
       maxAge: 24 * 60 * 60 * 1000, // i.e. 24 hours
     }));
     app.use(speechPassport.initialize());
@@ -84,12 +88,13 @@ function Server () {
   };
   this.start = () => {
     const db = require('./models/');
+    const PORT = siteConfig.details.port;
     // sync sequelize
     db.sequelize.sync()
     // start the server
       .then(() => {
-        this.server.listen(this.PORT, () => {
+        this.server.listen(PORT, () => {
-          logger.info(`Server is listening on PORT ${this.PORT}`);
+          logger.info(`Server is listening on PORT ${PORT}`);
         });
       })
       .catch((error) => {