Rename pool requests --> requests scheduler

diff --git a/server.js b/server.js
index 9772ce92b63eb2fbb4e79108b960da7360618a99..204cc146f3a1222ea7d2089fba13a64eb3005842 100644 (file)
--- a/server.js
+++ b/server.js
@@ -28,7 +28,7 @@ const customValidators = require('./server/helpers/customValidators')
 const database = require('./server/initializers/database')
 const installer = require('./server/initializers/installer')
 const logger = require('./server/helpers/logger')
-const poolRequests = require('./server/lib/poolRequests')
+const poolRequests = require('./server/lib/requestsScheduler')
 const routes = require('./server/controllers')
 const utils = require('./server/helpers/utils')
 const videos = require('./server/lib/videos')

diff --git a/server/lib/friends.js b/server/lib/friends.js
index c3c2316043c64d4c62bd4805db61f49a4d23ac87..9a2c5c06e6687c7f4a2ebb4e73223ff5b2d0529a 100644 (file)
--- a/server/lib/friends.js
+++ b/server/lib/friends.js
@@ -9,7 +9,7 @@ const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 const peertubeCrypto = require('../helpers/peertubeCrypto')
 const Pods = require('../models/pods')
-const poolRequests = require('../lib/poolRequests')
+const requestsScheduler = require('../lib/requestsScheduler')
 const requests = require('../helpers/requests')
 const Videos = require('../models/videos')
 
@@ -30,7 +30,7 @@ function addVideoToFriends (video) {
   const id = video.name + video.magnetUri
   // ensure namePath is null
   video.namePath = null
-  poolRequests.addRequest(id, 'add', video)
+  requestsScheduler.addRequest(id, 'add', video)
 }
 
 function hasFriends (callback) {
@@ -70,9 +70,9 @@ function makeFriends (callback) {
 
 function quitFriends (callback) {
   // Stop pool requests
-  poolRequests.deactivate()
+  requestsScheduler.deactivate()
   // Flush pool requests
-  poolRequests.forceSend()
+  requestsScheduler.forceSend()
 
   Pods.list(function (err, pods) {
     if (err) return callback(err)
@@ -90,7 +90,7 @@ function quitFriends (callback) {
     // Announce we quit them
     requests.makeMultipleRetryRequest(request, pods, function () {
       Pods.removeAll(function (err) {
-        poolRequests.activate()
+        requestsScheduler.activate()
 
         if (err) return callback(err)
 
@@ -110,7 +110,7 @@ function quitFriends (callback) {
 function removeVideoToFriends (video) {
   // To avoid duplicates
   const id = video.name + video.magnetUri
-  poolRequests.addRequest(id, 'remove', video)
+  requestsScheduler.addRequest(id, 'remove', video)
 }
 
 // ---------------------------------------------------------------------------
@@ -164,9 +164,9 @@ function getForeignPodsList (url, callback) {
 
 function makeRequestsToWinningPods (cert, pods_list, callback) {
   // Stop pool requests
-  poolRequests.deactivate()
+  requestsScheduler.deactivate()
   // Flush pool requests
-  poolRequests.forceSend()
+  requestsScheduler.forceSend()
 
   // Get the list of our videos to send to our new friends
   Videos.listOwned(function (err, videos_list) {
@@ -213,7 +213,7 @@ function makeRequestsToWinningPods (cert, pods_list, callback) {
 
       function endRequests (err) {
         // Now we made new friends, we can re activate the pool of requests
-        poolRequests.activate()
+        requestsScheduler.activate()
 
         if (err) {
           logger.error('There was some errors when we wanted to make friends.')

diff --git a/server/lib/poolRequests.js b/server/lib/requestsScheduler.js
similarity index 73%
rename from server/lib/poolRequests.js
rename to server/lib/requestsScheduler.js
index 49e61700c8ca071ec7f839a526535b9331a4a56d..2c5474e51204ace54c6d376dfd303d7a2c9501b1 100644 (file)
--- a/server/lib/poolRequests.js
+++ b/server/lib/requestsScheduler.js
@@ -6,13 +6,13 @@ const map = require('lodash/map')
 const constants = require('../initializers/constants')
 const logger = require('../helpers/logger')
 const Pods = require('../models/pods')
-const PoolRequests = require('../models/poolRequests')
+const Requests = require('../models/requests')
 const requests = require('../helpers/requests')
 const Videos = require('../models/videos')
 
 let timer = null
 
-const poolRequests = {
+const requestsScheduler = {
   activate: activate,
   addRequest: addRequest,
   deactivate: deactivate,
@@ -20,16 +20,16 @@ const poolRequests = {
 }
 
 function activate () {
-  logger.info('Pool requests activated.')
-  timer = setInterval(makePoolRequests, constants.INTERVAL)
+  logger.info('Requests scheduler activated.')
+  timer = setInterval(makeRequests, constants.INTERVAL)
 }
 
 function addRequest (id, type, request) {
-  logger.debug('Add request to the pool requests.', { id: id, type: type, request: request })
+  logger.debug('Add request to the requests scheduler.', { id: id, type: type, request: request })
 
-  PoolRequests.findById(id, function (err, entity) {
+  Requests.findById(id, function (err, entity) {
     if (err) {
-      logger.error('Cannot find one pool request.', { error: err })
+      logger.error('Cannot find one request.', { error: err })
       return // Abort
     }
 
@@ -40,15 +40,15 @@ function addRequest (id, type, request) {
       }
 
       // Remove the request of the other type
-      PoolRequests.removeRequestById(id, function (err) {
+      Requests.removeRequestById(id, function (err) {
         if (err) {
-          logger.error('Cannot remove a pool request.', { error: err })
+          logger.error('Cannot remove a request.', { error: err })
           return // Abort
         }
       })
     } else {
-      PoolRequests.create(id, type, request, function (err) {
-        if (err) logger.error('Cannot create a pool request.', { error: err })
+      Requests.create(id, type, request, function (err) {
+        if (err) logger.error('Cannot create a request.', { error: err })
         return // Abort
       })
     }
@@ -56,22 +56,22 @@ function addRequest (id, type, request) {
 }
 
 function deactivate () {
-  logger.info('Pool requests deactivated.')
+  logger.info('Requests scheduler deactivated.')
   clearInterval(timer)
 }
 
 function forceSend () {
-  logger.info('Force pool requests sending.')
-  makePoolRequests()
+  logger.info('Force requests scheduler sending.')
+  makeRequests()
 }
 
 // ---------------------------------------------------------------------------
 
-module.exports = poolRequests
+module.exports = requestsScheduler
 
 // ---------------------------------------------------------------------------
 
-function makePoolRequest (type, requests_to_make, callback) {
+function makeRequest (type, requests_to_make, callback) {
   if (!callback) callback = function () {}
 
   Pods.list(function (err, pods) {
@@ -118,16 +118,16 @@ function makePoolRequest (type, requests_to_make, callback) {
   })
 }
 
-function makePoolRequests () {
-  logger.info('Making pool requests to friends.')
+function makeRequests () {
+  logger.info('Making requests to friends.')
 
-  PoolRequests.list(function (err, pool_requests) {
+  Requests.list(function (err, requests) {
     if (err) {
-      logger.error('Cannot get the list of pool requests.', { err: err })
+      logger.error('Cannot get the list of requests.', { err: err })
       return // Abort
     }
 
-    if (pool_requests.length === 0) return
+    if (requests.length === 0) return
 
     const requests_to_make = {
       add: {
@@ -140,7 +140,7 @@ function makePoolRequests () {
       }
     }
 
-    async.each(pool_requests, function (pool_request, callback_each) {
+    async.each(requests, function (pool_request, callback_each) {
       if (pool_request.type === 'add') {
         requests_to_make.add.requests.push(pool_request.request)
         requests_to_make.add.ids.push(pool_request._id)
@@ -148,7 +148,7 @@ function makePoolRequests () {
         requests_to_make.remove.requests.push(pool_request.request)
         requests_to_make.remove.ids.push(pool_request._id)
       } else {
-        logger.error('Unkown pool request type.', { request_type: pool_request.type })
+        logger.error('Unkown request type.', { request_type: pool_request.type })
         return // abort
       }
 
@@ -156,19 +156,19 @@ function makePoolRequests () {
     }, function () {
       // Send the add requests
       if (requests_to_make.add.requests.length !== 0) {
-        makePoolRequest('add', requests_to_make.add.requests, function (err) {
-          if (err) logger.error('Errors when sent add pool requests.', { error: err })
+        makeRequest('add', requests_to_make.add.requests, function (err) {
+          if (err) logger.error('Errors when sent add requests.', { error: err })
 
-          PoolRequests.removeRequests(requests_to_make.add.ids)
+          Requests.removeRequests(requests_to_make.add.ids)
         })
       }
 
       // Send the remove requests
       if (requests_to_make.remove.requests.length !== 0) {
-        makePoolRequest('remove', requests_to_make.remove.requests, function (err) {
+        makeRequest('remove', requests_to_make.remove.requests, function (err) {
           if (err) logger.error('Errors when sent remove pool requests.', { error: err })
 
-          PoolRequests.removeRequests(requests_to_make.remove.ids)
+          Requests.removeRequests(requests_to_make.remove.ids)
         })
       }
     })

diff --git a/server/models/poolRequests.js b/server/models/requests.js
similarity index 61%
rename from server/models/poolRequests.js
rename to server/models/requests.js
index 28093a94c0c66641ef6a9634a247629d6e628052..2152ae0e92756c88b10ec697e88f757d2c1f179a 100644 (file)
--- a/server/models/poolRequests.js
+++ b/server/models/requests.js
@@ -6,16 +6,16 @@ const logger = require('../helpers/logger')
 
 // ---------------------------------------------------------------------------
 
-const poolRequestsSchema = mongoose.Schema({
+const requestsSchema = mongoose.Schema({
   type: String,
   id: String, // Special id to find duplicates (video created we want to remove...)
   request: mongoose.Schema.Types.Mixed
 })
-const PoolRequestsDB = mongoose.model('poolRequests', poolRequestsSchema)
+const RequestsDB = mongoose.model('requests', requestsSchema)
 
 // ---------------------------------------------------------------------------
 
-const PoolRequests = {
+const Requests = {
   create: create,
   findById: findById,
   list: list,
@@ -24,25 +24,25 @@ const PoolRequests = {
 }
 
 function create (id, type, request, callback) {
-  PoolRequestsDB.create({ id: id, type: type, request: request }, callback)
+  RequestsDB.create({ id: id, type: type, request: request }, callback)
 }
 
 function findById (id, callback) {
-  PoolRequestsDB.findOne({ id: id }, callback)
+  RequestsDB.findOne({ id: id }, callback)
 }
 
 function list (callback) {
-  PoolRequestsDB.find({}, { _id: 1, type: 1, request: 1 }, callback)
+  RequestsDB.find({}, { _id: 1, type: 1, request: 1 }, callback)
 }
 
 function removeRequestById (id, callback) {
-  PoolRequestsDB.remove({ id: id }, callback)
+  RequestsDB.remove({ id: id }, callback)
 }
 
 function removeRequests (ids) {
-  PoolRequestsDB.remove({ _id: { $in: ids } }, function (err) {
+  RequestsDB.remove({ _id: { $in: ids } }, function (err) {
     if (err) {
-      logger.error('Cannot remove requests from the pool requests database.', { error: err })
+      logger.error('Cannot remove requests from the requests database.', { error: err })
       return // Abort
     }
 
@@ -52,4 +52,4 @@ function removeRequests (ids) {
 
 // ---------------------------------------------------------------------------
 
-module.exports = PoolRequests
+module.exports = Requests