@autofleet/node-common 1.1.25 → 1.1.26

package/events/index.js

@@ -11,8 +11,8 @@ const publish = (eventType, eventObj, debug = false) => {
     return 'Missing project/topic';
   }
 
-  if (envv === 'development' && !debug) {
-    return 'Not publishing in dev';
+  if ((envv === 'development' || envv === 'test') && !debug) {
+    return 'Not publishing in dev/test';
   }
 
   const pubsubClient = new PubSub({ projectId });

package/index.js

@@ -3,8 +3,7 @@ const Logger = require('./logger');
 const Settings = require('./settings');
 const client = require('./delorean-client');
 const Router = require('./router');
-
-require('./monitor');
+const Queue = require('./queue');
 
 module.exports = {
   Network,
@@ -14,4 +13,5 @@ module.exports = {
     client,
   },
   Router,
+  Queue,
 };

package/logger/index.js

@@ -1,9 +1,7 @@
-require('dotenv').config();
 const winston = require('winston');
-const { LoggingWinston } = require('@google-cloud/logging-winston');
 
 const { createLogger } = winston;
-const loggingWinston = new LoggingWinston();
+require('dotenv').config();
 
 const { env } = process;
 
@@ -13,7 +11,8 @@ const infoEnvNmaes = [
   'test',
 ];
 
-const getLevel = () => {
+const getLevel = (logLevel) => {
+  if (logLevel) return logLevel;
   if (env.LOG_LEVEL) return env.LOG_LEVEL;
   if (infoEnvNmaes.includes(env.NODE_ENV)) return 'info';
   if (env.NODE_ENV === 'development') return 'debug';
@@ -21,8 +20,7 @@ const getLevel = () => {
 };
 
 const getFormat = () => {
-  if (env.AF_SERVICE_NAME) {
-    // Runing on cluster
+  if (env.NODE_ENV === 'producation') {
     return winston.format.json();
   }
 
@@ -34,20 +32,13 @@ const getFormat = () => {
 };
 
 const createLoggerInstance = (level, transports) => {
-  const options = {
+  const logger = createLogger({
+    level,
     format: getFormat(),
-    transports: [
-      new winston.transports.Console(),
-    ],
+    transports: [new winston.transports.Console()],
     exceptionHandlers: transports,
     exitOnError: false,
-  };
-
-  if (env.AF_SERVICE_NAME) {
-    options.transports.push(loggingWinston);
-  }
-
-  const logger = createLogger(options);
+  });
 
   return logger;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.25",
+  "version": "1.1.26",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -22,9 +22,6 @@
   },
   "homepage": "https://gitlab.com/AutoFleet/node-common#README",
   "dependencies": {
-    "@google-cloud/logging-winston": "^0.9.0",
-    "@google-cloud/monitoring": "^0.6.0",
-    "@google-cloud/profiler": "^0.2.0",
     "@google-cloud/pubsub": "^0.19.0",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",
@@ -34,10 +31,11 @@
     "jest": "^22.4.3",
     "mock-socket": "^7.1.0",
     "node-cache": "^4.2.0",
+    "node-resque": "^5.4.1",
     "portfinder": "^1.0.13",
     "qs": "^6.5.2",
     "timekeeper": "^2.1.2",
-    "winston": "^3.0.0",
+    "winston": "^3.0.0-rc4",
     "ws": "^5.2.1"
   },
   "devDependencies": {

package/queue/index.js

@@ -0,0 +1,105 @@
+const NodeResque = require('node-resque');
+const logger = require('../logger')();
+
+const redisBaseSettings = {
+  pkg: 'ioredis',
+  host: '127.0.0.1',
+  password: '',
+  port: 6379,
+  database: 0,
+  namespace: 'resque',
+};
+
+class AfQueue {
+  static redisParams(params) {
+    return Object.assign({}, redisBaseSettings, params);
+  }
+
+  constructor() {
+    this.inited = false;
+  }
+
+  async exitHandler() {
+    process.stdin.resume();
+
+    if (this.existing) {
+      return;
+    }
+
+    this.existing = true;
+    logger.info('Will remove AfQueue');
+    if (this.scheduler) {
+      await this.scheduler.end();
+    }
+
+    if (this.queue) {
+      await this.queue.end();
+    }
+
+    if (this.worker) {
+      this.worker.on('end', process.exit);
+      await this.worker.end();
+    } else {
+      process.exit();
+    }
+  }
+
+  async init(connectionDetails, workerSettings, shouldCreateQueue = true) {
+    if (this.inited) {
+      throw new Error('AfQueue: Already inited');
+    }
+
+    const redisConf = Object.assign({}, redisBaseSettings, connectionDetails);
+    this.inited = true;
+    const promiseArr = [];
+    if (shouldCreateQueue) {
+      promiseArr.push(this.startScheduler(redisConf));
+      promiseArr.push(this.startQueue(redisConf));
+    }
+
+    if (workerSettings) {
+      promiseArr.push(this.startWorker(redisConf, workerSettings));
+    }
+
+    process.on('SIGINT', this.exitHandler.bind(this));
+    process.on('SIGINT', this.exitHandler.bind(this));
+    process.on('SIGTERM', this.exitHandler.bind(this));
+
+    return Promise.all(promiseArr);
+  }
+
+  async getQueue() {
+    if (!this.queue) {
+      await this.startQueue();
+    }
+    return this.queue;
+  }
+
+  async startScheduler(connectionDetails) {
+    this.scheduler = new NodeResque.Scheduler({
+      connection: AfQueue.redisParams(connectionDetails),
+    });
+    await this.scheduler.connect();
+    this.scheduler.start();
+  }
+
+  async startQueue(connectionDetails) {
+    this.queue = new NodeResque.Queue({
+      connection: AfQueue.redisParams(connectionDetails),
+    });
+    await this.queue.connect();
+  }
+
+  async startWorker(connectionDetails, { queues, jobs }) {
+    this.worker = new NodeResque.Worker({
+      connection: AfQueue.redisParams(connectionDetails),
+      queues,
+    }, jobs);
+
+    await this.worker.connect();
+    this.worker.start();
+  }
+}
+
+
+module.exports = new AfQueue();

package/monitor/index.js

@@ -1,16 +0,0 @@
-const monitoring = require('@google-cloud/monitoring');
-const profiler = require('@google-cloud/profiler');
-
-const projectId = process.env.PROJECT_ID;
-const afServiceName = process.env.AF_SERVICE_NAME;
-
-if (projectId) {
-  const client = new monitoring.MetricServiceClient(); // eslint-disable-line
-
-  profiler.start({
-    serviceContext: {
-      service: afServiceName,
-      version: '1.0.0',
-    },
-  });
-}