feat: queue handling

2017-08-02 23:47:11 -04:00
parent 2020e457cf
commit 749766e9bd
13 changed files with 244 additions and 152 deletions
--- a/server/worker.js
+++ b/server/worker.js
@@ -2,69 +2,68 @@

 /* global wiki */

-const path = require('path')
-
-wiki.REPOPATH = path.resolve(wiki.ROOTPATH, wiki.config.paths.repo)
-wiki.DATAPATH = path.resolve(wiki.ROOTPATH, wiki.config.paths.data)
-wiki.UPLTEMPPATH = path.join(wiki.DATAPATH, 'temp-upload')
-
-// ----------------------------------------
-// Load global modules
-// ----------------------------------------
-
-// wiki.upl = require('./modules/uploads-agent').init()
-// wiki.git = require('./modules/git').init()
-// wiki.entries = require('./modules/entries').init()
-wiki.lang = require('i18next')
-wiki.mark = require('./modules/markdown')
-
-// ----------------------------------------
-// Load local modules
-// ----------------------------------------
-
 const Promise = require('bluebird')
-const i18nBackend = require('i18next-node-fs-backend')

-// ----------------------------------------
-// Localization Engine
-// ----------------------------------------
-
-wiki.lang.use(i18nBackend).init({
-  load: 'languageOnly',
-  ns: ['common', 'admin', 'auth', 'errors', 'git'],
-  defaultNS: 'common',
-  saveMissing: false,
-  preload: [wiki.config.lang],
-  lng: wiki.config.lang,
-  fallbackLng: 'en',
-  backend: {
-    loadPath: path.join(wiki.SERVERPATH, 'locales/{{lng}}/{{ns}}.json')
-  }
-})
-
-// ----------------------------------------
-// Start Queues
-// ----------------------------------------
-
-const Bull = require('bull')
-const autoload = require('auto-load')
-
-let queues = autoload(path.join(wiki.SERVERPATH, 'queues'))
-
-Promise.join(
-  wiki.db.onReady
-  // wiki.upl.initialScan()
+module.exports = Promise.join(
+  wiki.db.onReady,
+  wiki.configSvc.loadFromDb(['features', 'git', 'logging', 'site', 'uploads'])
 ).then(() => {
+  const path = require('path')
+
+  wiki.REPOPATH = path.resolve(wiki.ROOTPATH, wiki.config.paths.repo)
+  wiki.DATAPATH = path.resolve(wiki.ROOTPATH, wiki.config.paths.data)
+  wiki.UPLTEMPPATH = path.join(wiki.DATAPATH, 'temp-upload')
+
+  // ----------------------------------------
+  // Load global modules
+  // ----------------------------------------
+
+  // wiki.upl = require('./modules/uploads-agent').init()
+  // wiki.git = require('./modules/git').init()
+  // wiki.entries = require('./modules/entries').init()
+  wiki.lang = require('i18next')
+  wiki.mark = require('./modules/markdown')
+
+  // ----------------------------------------
+  // Localization Engine
+  // ----------------------------------------
+
+  const i18nBackend = require('i18next-node-fs-backend')
+  wiki.lang.use(i18nBackend).init({
+    load: 'languageOnly',
+    ns: ['common', 'admin', 'auth', 'errors', 'git'],
+    defaultNS: 'common',
+    saveMissing: false,
+    preload: [wiki.config.lang],
+    lng: wiki.config.lang,
+    fallbackLng: 'en',
+    backend: {
+      loadPath: path.join(wiki.SERVERPATH, 'locales/{{lng}}/{{ns}}.json')
+    }
+  })
+
+  // ----------------------------------------
+  // Start Queues
+  // ----------------------------------------
+
+  const Bull = require('bull')
+  const autoload = require('auto-load')
+
+  let queues = autoload(path.join(wiki.SERVERPATH, 'queues'))
+
  for (let queueName in queues) {
-    new Bull(queueName, { redis: wiki.config.redis }).process(queues[queueName])
+    new Bull(queueName, {
+      prefix: `q-${wiki.config.ha.nodeuid}`,
+      redis: wiki.config.redis
+    }).process(queues[queueName])
  }
-})

-// ----------------------------------------
-// Shutdown gracefully
-// ----------------------------------------
+  // ----------------------------------------
+  // Shutdown gracefully
+  // ----------------------------------------

-process.on('disconnect', () => {
-  wiki.logger.warn('Lost connection to Master. Exiting...')
-  process.exit()
+  process.on('disconnect', () => {
+    wiki.logger.warn('Lost connection to Master. Exiting...')
+    process.exit()
+  })
 })