Merge branch 'develop' into master

Author: dbusel

CHANGELOG.md

@@ -5,6 +5,17 @@ Also see the **[release page](https://github.com/ioFog/Controller/releases)**.
 <br>
 
 ## [1.0.22](https://github.com/ioFog/Controller/releases/tag/1.0.22) (2018-11-26)
+## [1.0.20](https://github.com/ioFog/Controller/releases/tag/1.0.20) (2018-11-24)
+
+
+<br>
+
+## [1.0.19](https://github.com/ioFog/Controller/releases/tag/1.0.19) (2018-11-22)
+
+
+<br>
+
+## [1.0.0](https://github.com/ioFog/Controller/releases/tag/1.0.0) (2018-10-30)
 
 
 <br>

package.json

@@ -38,9 +38,10 @@
 		"start-dev": "NODE_ENV=development node ./src/main.js start",
 		"build": "export NODE_ENV=production && cd src/sequelize && ../../node_modules/.bin/sequelize db:migrate && ../../node_modules/.bin/sequelize db:seed:all",
 		"preuninstall": "bash scripts/preuninstall.sh",
-		"postinstall": "bash scripts/postinstall.sh",
+		"postinstall": "bash scripts/postinstall.sh && NODE_ENV=production node ./src/main.js init",
 		"lint": "./node_modules/.bin/eslint \"**/*.js\"",
-		"automatic-release": "automatic-release"
+		"automatic-release": "automatic-release",
+		"test": ""
 	},
 	"preferGlobal": true,
 	"bin": {

src/cli/index.js

@@ -36,6 +36,8 @@ class Cli extends BaseCLIHandler {
     this.commands = {
       [constants.CMD_START]: 'Start iofog-controller service.',
       [constants.CMD_STOP]: 'Stop iofog-controller service.',
+      //init db is hidden command
+      // [constants.CMD_INIT_DB]: 'Init sqlite db for iofog-controller.',
       [constants.CMD_CONTROLLER]: 'Display iofog-controller service information.',
       [constants.CMD_HELP]: 'Display usage information.',
       [constants.CMD_USER]: 'User operations.',
@@ -60,6 +62,8 @@ class Cli extends BaseCLIHandler {
         return Start.run({ daemon });
       case constants.CMD_STOP:
         return daemon.stop();
+      case constants.CMD_INIT_DB:
+        return Start.initDB();
       case constants.CMD_CONTROLLER:
         return Controller.run({ argv });
       case constants.CMD_USER:

src/cli/start.js

@@ -29,19 +29,23 @@ class Start extends BaseCLIHandler {
     const pid = daemon.status();
 
     if (pid === 0) {
-      try {
-        await db.migrate();
-        await db.seed();
-      } catch (err) {
-        logger.silly('Unable to initialize the database.', err);
-        process.exit(1)
-      }
+      this.initDB();
       daemon.start();
       checkDaemon(daemon, configuration)
     } else {
       logger.silly(`iofog-controller already running. PID: ${pid}`)
     }
   }
+
+  async initDB() {
+    try {
+      await db.migrate();
+      await db.seed();
+    } catch (err) {
+      logger.silly('Unable to initialize the database.', err);
+      process.exit(1)
+    }
+  }
 }
 
 function checkDaemon(daemon, configuration) {

src/daemon.js

@@ -0,0 +1,45 @@
+/*
+ *  *******************************************************************************
+ *  * Copyright (c) 2018 Edgeworx, Inc.
+ *  *
+ *  * This program and the accompanying materials are made available under the
+ *  * terms of the Eclipse Public License v. 2.0 which is available at
+ *  * http://www.eclipse.org/legal/epl-2.0
+ *  *
+ *  * SPDX-License-Identifier: EPL-2.0
+ *  *******************************************************************************
+ *
+ */
+
+const daemonize = require('daemonize2');
+const logger = require('./logger');
+
+const daemon = daemonize.setup({
+  main: 'server.js',
+  name: 'iofog-controller',
+  pidfile: 'iofog-controller.pid',
+  silent: true,
+});
+
+daemon
+  .on('starting', async () => {
+    logger.silly('Starting iofog-controller...');
+  })
+  .on('stopping', () => {
+    logger.silly('Stopping iofog-controller...')
+  })
+  .on('stopped', (pid) => {
+    logger.silly('iofog-controller stopped.')
+  })
+  .on('running', (pid) => {
+    logger.silly('iofog-controller already running. PID: ' + pid)
+  })
+  .on('notrunning', () => {
+    logger.silly('iofog-controller is not running')
+  })
+  .on('error', (err) => {
+    logger.silly('iofog-controller failed to start:  ' + err.message)
+  });
+
+
+module.exports = daemon;

src/helpers/constants.js

@@ -25,6 +25,7 @@ module.exports = {
   CMD_HELP: 'help',
   CMD_START: 'start',
   CMD_STOP: 'stop',
+  CMD_INIT_DB: 'init',
   CMD_STATUS: 'status',
   CMD_VERSION: 'version',
   CMD_USER: 'user',

src/main.js

@@ -17,40 +17,13 @@ if (!process.env.NODE_ENV) {
   process.env.NODE_ENV = 'production'
 }
 
-const daemonize = require('daemonize2');
 const Cli = require('./cli');
 const logger = require('./logger');
+const daemon = require('./daemon');
 
 function main() {
-  const daemon = daemonize.setup({
-    main: 'server.js',
-    name: 'iofog-controller',
-    pidfile: 'iofog-controller.pid',
-    silent: true,
-  });
-
   const cli = new Cli();
 
-  daemon
-    .on('starting', async () => {
-      logger.silly('Starting iofog-controller...');
-    })
-    .on('stopping', () => {
-      logger.silly('Stopping iofog-controller...')
-    })
-    .on('stopped', (pid) => {
-      logger.silly('iofog-controller stopped.')
-    })
-    .on('running', (pid) => {
-      logger.silly('iofog-controller already running. PID: ' + pid)
-    })
-    .on('notrunning', () => {
-      logger.silly('iofog-controller is not running')
-    })
-    .on('error', (err) => {
-      logger.silly('iofog-controller failed to start:  ' + err.message)
-    });
-
   cli.run(daemon)
 }
 

src/sequelize/managers/microservice-manager.js

@@ -26,6 +26,20 @@ const Routing = models.Routing;
 const Registry = models.Registry;
 const MicroserviceStatus = models.MicroserviceStatus;
 
+const microserviceExcludedFields = [
+  'configLastUpdated',
+  'created_at',
+  'updated_at',
+  'updatedBy',
+  'registryId',
+  'isNetwork',
+  'rebuild',
+  'deleteWithCleanUp',
+  'imageSnapshot',
+  'catalog_item_id',
+  'iofog_uuid'
+];
+
 class MicroserviceManager extends BaseManager {
   getEntity() {
     return Microservice
@@ -247,41 +261,20 @@ class MicroserviceManager extends BaseManager {
     return Microservice.findOne({
       where: where,
       attributes: {
-        exclude: [
-          'configLastUpdated',
-          'created_at',
-          'updated_at',
-          'updatedBy',
-          'registryId',
-          'isNetwork',
-          'rebuild',
-          'deleteWithCleanUp',
-          'imageSnapshot',
-          'catalog_item_id',
-          'iofog_uuid'
-        ]}}, {transaction: transaction})
+        exclude: microserviceExcludedFields
+      }}, {
+      transaction: transaction
+    });
   }
 
   async findAllExcludeFields(where, transaction) {
     return Microservice.findAll({
       where: where,
       attributes: {
-        exclude: [
-          'configLastUpdated',
-          'created_at',
-          'updated_at',
-          'updatedBy',
-          'flowId',
-          'registryId',
-          'isNetwork',
-          'rebuild',
-          'deleteWithCleanUp',
-          'imageSnapshot',
-          'catalog_item_id',
-          'iofog_uuid',
-          'iofogUuid',
-          'catalogItemId'
-        ]}}, {transaction: transaction})
+        exclude: microserviceExcludedFields
+      }}, {
+      transaction: transaction
+    });
   }
 }
 

src/services/controller-service.js

@@ -42,8 +42,17 @@ const emailActivation = async function (isCLI) {
 };
 
 const statusController = async function (isCLI) {
+  const daemon = require('../daemon');
+
+  let pid = daemon.status();
+  if (pid === 0) {
+    status = 'offline'
+  } else {
+    status = 'online'
+  }
+
   return {
-    "status": "ok",
+    "status": status,
     "timestamp": Date.now(),
   }
 };

src/services/microservices-service.js

@@ -136,7 +136,7 @@ const _createVolumeMappings = async function (volumeMappings, microserviceUuid,
 
 const _createRoutes = async function (routes, microserviceUuid, user, transaction) {
   for (let route of routes) {
-    await _createRoute(microserviceUuid, route, user, transaction)
+    await _createRoute(microserviceUuid, route, user, false, transaction)
   }
 };
 
@@ -470,7 +470,7 @@ async function _createNetworkMicroserviceForMaster(masterMicroservice, sourceNet
     iofogUuid: masterMicroservice.iofogUuid,
     rootHostAccess: false,
     logSize: 50,
-    userId: user.id,
+    userId: masterMicroservice.userId,
     configLastUpdated: Date.now()
   };