Infile code reorganization

3 files changed, 50 insertions, 38 deletions

diff --git a/initializers/checker.js b/initializers/checker.js
index 7a3a53616..7a09c02d1 100644
--- a/initializers/checker.js
+++ b/initializers/checker.js
@@ -4,10 +4,13 @@
   var config = require('config')
   var mkdirp = require('mkdirp')
 
-  var checker = {}
+  var checker = {
+    checkConfig: checkConfig,
+    createDirectoriesIfNotExist: createDirectoriesIfNotExist
+  }
 
   // Check the config files
-  checker.checkConfig = function () {
+  function checkConfig () {
     var required = [ 'listen.port',
       'webserver.https', 'webserver.host', 'webserver.port',
       'database.host', 'database.port', 'database.suffix',
@@ -25,7 +28,7 @@
   }
 
   // Create directories for the storage if it doesn't exist
-  checker.createDirectoriesIfNotExist = function () {
+  function createDirectoriesIfNotExist () {
     var storages = config.get('storage')
 
     for (var key of Object.keys(storages)) {
@@ -40,6 +43,7 @@
     }
   }
 
-  // ----------- Export -----------
+  // ---------------------------------------------------------------------------
+
   module.exports = checker
 })()
diff --git a/initializers/constants.js b/initializers/constants.js
index 00b713961..1e101a747 100644
--- a/initializers/constants.js
+++ b/initializers/constants.js
@@ -1,37 +1,44 @@
 ;(function () {
   'use strict'
 
-  var constants = {}
-
-  function isTestInstance () {
-    return (process.env.NODE_ENV === 'test')
-  }
-
   // API version of our pod
-  constants.API_VERSION = 'v1'
+  var API_VERSION = 'v1'
 
   // Score a pod has when we create it as a friend
-  constants.FRIEND_BASE_SCORE = 100
+  var FRIEND_BASE_SCORE = 100
 
   // Time to wait between requests to the friends
-  constants.INTERVAL = 60000
+  var INTERVAL = 60000
 
   // Number of points we add/remove from a friend after a successful/bad request
-  constants.PODS_SCORE = {
+  var PODS_SCORE = {
     MALUS: -10,
     BONUS: 10
   }
 
   // Number of retries we make for the make retry requests (to friends...)
-  constants.REQUEST_RETRIES = 10
+  var REQUEST_RETRIES = 10
 
   // Special constants for a test instance
   if (isTestInstance() === true) {
-    constants.FRIEND_BASE_SCORE = 20
-    constants.INTERVAL = 10000
-    constants.REQUEST_RETRIES = 2
+    FRIEND_BASE_SCORE = 20
+    INTERVAL = 10000
+    REQUEST_RETRIES = 2
+  }
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = {
+    API_VERSION: API_VERSION,
+    FRIEND_BASE_SCORE: FRIEND_BASE_SCORE,
+    INTERVAL: INTERVAL,
+    PODS_SCORE: PODS_SCORE,
+    REQUEST_RETRIES: REQUEST_RETRIES
   }
 
-  // ----------- Export -----------
-  module.exports = constants
+  // ---------------------------------------------------------------------------
+
+  function isTestInstance () {
+    return (process.env.NODE_ENV === 'test')
+  }
 })()
diff --git a/initializers/database.js b/initializers/database.js
index 4570d3739..e041d5c4b 100644
--- a/initializers/database.js
+++ b/initializers/database.js
@@ -11,17 +11,6 @@
   var host = config.get('database.host')
   var port = config.get('database.port')
 
-  // ----------- Videos -----------
-  var videosSchema = mongoose.Schema({
-    name: String,
-    namePath: String,
-    description: String,
-    magnetUri: String,
-    podUrl: String
-  })
-
-  var VideosDB = mongoose.model('videos', videosSchema)
-
   // ----------- Pods -----------
   var podsSchema = mongoose.Schema({
     url: String,
@@ -40,6 +29,25 @@
 
   var PoolRequestsDB = mongoose.model('poolRequests', poolRequestsSchema)
 
+  // ----------- Videos -----------
+  var videosSchema = mongoose.Schema({
+    name: String,
+    namePath: String,
+    description: String,
+    magnetUri: String,
+    podUrl: String
+  })
+
+  var VideosDB = mongoose.model('videos', videosSchema)
+
+  // ---------------------------------------------------------------------------
+
+  module.exports = {
+    PodsDB: PodsDB,
+    PoolRequestsDB: PoolRequestsDB,
+    VideosDB: VideosDB
+  }
+
   // ----------- Connection -----------
 
   mongoose.connect('mongodb://' + host + ':' + port + '/' + dbname)
@@ -51,11 +59,4 @@
   mongoose.connection.on('open', function () {
     logger.info('Connected to mongodb.')
   })
-
-  // ----------- Export -----------
-  module.exports = {
-    VideosDB: VideosDB,
-    PodsDB: PodsDB,
-    PoolRequestsDB: PoolRequestsDB
-  }
 })()