made workers stand alone, fixed dockerfiles for clock and the app and added the docker file for workers, added loggly support, added mongodb 3.6 support, better error handling, updated templates

Author: iolufemi

.gitignore

@@ -35,3 +35,6 @@ jspm_packages
 
 # Optional REPL history
 .node_repl_history
+
+#Mac
+.DS_Store

Dockerfile

@@ -2,10 +2,12 @@ FROM node:carbon
 
 WORKDIR /usr/src/app
 
-COPY ../package*.json ./
+COPY package*.json ./
 
 RUN npm install
 
 COPY . .
 
-CMD [ "npm", "run", "clock" ]
+EXPOSE 8080
+
+CMD [ "npm", "start" ]

app.js

@@ -35,7 +35,6 @@ if (cluster.isMaster && config.env === 'production') {
 	var app = express();
 	var router = require('./routes');
     var express_enforces_ssl = require('express-enforces-ssl');
-    var workers = require('./services/queue/workers');
 
     if(config.trustProxy === 'yes'){
       app.enable('trust proxy');

clock/Dockerfile

@@ -2,7 +2,7 @@ FROM node:carbon
 
 WORKDIR /usr/src/app
 
-COPY ../package*.json ./
+COPY ./package*.json ./
 
 RUN npm install
 

config/development.js

@@ -30,5 +30,10 @@ module.exports = {
     SQLHost: process.env.SQL_HOST || '192.168.99.100',
     SQLPort: process.env.SQL_PORT || 3306,
     SQLDriver: process.env.SQL_DRIVER || 'mysql', //'mysql'|'sqlite'|'postgres'|'mssql'
-    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00'
+    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00',
+    clockTimezone: process.env.CLOCK_TIMEZONE || 'Africa/Lagos',
+    workerConcurrency: process.env.WORKER_CONCURRENCY || '1',
+    logglyToken: process.env.LOGGLY_TOKEN || false,
+    logglySubdomain: process.env.LOGGLY_SUBDOMAIN || false,
+    logglyTag: process.env.LOGGLY_TAG || false
 };

config/production.js

@@ -27,8 +27,13 @@ module.exports = {
     SQLUsername: process.env.SQL_USERNAME || 'root',
     SQLPassword: process.env.SQL_PASSWORD || null,
     SQLDatabase: process.env.SQL_DATABASE || 'snipe',
-    SQLHost: process.env.SQL_HOST || 'localhost',
+    SQLHost: process.env.SQL_HOST || '192.168.99.100',
     SQLPort: process.env.SQL_PORT || 3306,
     SQLDriver: process.env.SQL_DRIVER || 'mysql', //'mysql'|'sqlite'|'postgres'|'mssql'
-    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00'
+    SQLTimezone: process.env.SQL_TIMEZONE || '+01:00',
+    clockTimezone: process.env.CLOCK_TIMEZONE || 'Africa/Lagos',
+    workerConcurrency: process.env.WORKER_CONCURRENCY || '1',
+    logglyToken: process.env.LOGGLY_TOKEN || false,
+    logglySubdomain: process.env.LOGGLY_SUBDOMAIN || false,
+    logglyTag: process.env.LOGGLY_TAG || false
 };

models/RequestLogs.js

@@ -49,7 +49,8 @@ var schemaObject = {
 
 schemaObject.createdAt = {
     type: 'Date',
-    default: Date.now
+    default: Date.now,
+    index: true
 };
 
 schemaObject.updatedAt = {
@@ -59,12 +60,12 @@ schemaObject.updatedAt = {
 
 schemaObject.owner = {
     type: db._mongoose.Schema.Types.ObjectId,
-    ref: 'Users'
+    ref: 'Accounts'
 };
 
 schemaObject.createdBy = {
     type: db._mongoose.Schema.Types.ObjectId,
-    ref: 'Users'
+    ref: 'Accounts'
 };
 
 schemaObject.client = {
@@ -165,20 +166,20 @@ Schema.post('find', function(result) {
 Schema.pre('update', function(next) {
 
     // Indexing for search
-    var ourDoc = this._update.$set;
-    debug('What we are updating: ', ourDoc);
-    ourDoc.model = collection;
-    ourDoc.update = true;
-    debug('what do we have here: ', ourDoc);
-    if(ourDoc.updatedAt || ourDoc.tags){
-        debug('updatedAt: ', ourDoc.updatedAt);
-        debug('tags: ', ourDoc.tags);
-        // Move along! Nothing to see here!!
-    }else{
-        // Dump it in the queue
-        queue.create('searchIndex', ourDoc)
-        .save();
-    }
+    var ourDoc = this._update;
+    // debug('What we are updating: ', ourDoc);
+    // ourDoc.model = collection;
+    // ourDoc.update = true;
+    // debug('what do we have here: ', ourDoc);
+    // if(ourDoc.updatedAt || ourDoc.tags){
+    //     debug('updatedAt: ', ourDoc.updatedAt);
+    //     debug('tags: ', ourDoc.tags);
+    //     // Move along! Nothing to see here!!
+    // }else{
+    //     // Dump it in the queue
+    //     queue.create('searchIndex', ourDoc)
+    //     .save();
+    // }
     ourDoc.updatedAt = new Date(Date.now()).toISOString();
     next();
 });

models/Trash.js

@@ -22,7 +22,8 @@ var schemaObject = {
 
 schemaObject.createdAt = {
     type: 'Date',
-    default: Date.now
+    default: Date.now,
+    index: true
 };
 
 schemaObject.updatedAt = {
@@ -32,12 +33,12 @@ schemaObject.updatedAt = {
 
 schemaObject.owner = {
     type: db._mongoose.Schema.Types.ObjectId,
-    ref: 'Users'
+    ref: 'Accounts'
 };
 
 schemaObject.deletedBy = {
     type: db._mongoose.Schema.Types.ObjectId,
-    ref: 'Users'
+    ref: 'Accounts'
 };
 
 schemaObject.client = {
@@ -137,7 +138,7 @@ Schema.post('find', function(result) {
 
 Schema.pre('update', function(next) {
     // Indexing for search
-    var ourDoc = this._update.$set;
+    var ourDoc = this._update;
     ourDoc.model = collection;
     ourDoc.update = true;
 

package.json

@@ -6,7 +6,8 @@
   "scripts": {
     "test": "gulp sanity",
     "start": "node app",
-    "clock": "node ./services/queue/clock"
+    "clock": "node ./services/queue/clock",
+    "workers": "node ./services/queue/workers"
   },
   "repository": {
     "type": "git",
@@ -68,7 +69,7 @@
     "hpp": "^0.2.2",
     "kue": "^0.11.6",
     "lodash": "^4.17.4",
-    "mongoose": "^4.9.0",
+    "mongoose": "^5.0.0",
     "mysql2": "^1.5.1",
     "pg": "^6.4.2",
     "pg-hstore": "^2.3.2",
@@ -78,10 +79,12 @@
     "request": "^2.83.0",
     "request-promise": "^4.2.1",
     "sequelize": "^4.28.6",
+    "shortid": "^2.2.8",
     "sqlite3": "^3.1.13",
     "tedious": "^2.1.5",
     "util": "^0.10.3",
     "winston": "^2.3.1",
-    "winston-bugsnag": "^2.1.0"
+    "winston-bugsnag": "^2.1.0",
+    "winston-loggly-bulk": "^2.0.2"
   }
 }