22.11 release version 1.0.19 (#383)

* EWC-359 `controller status` returns real status (online/offline)

* Revert "EWC-359 `controller status` returns real status (online/offline)"

* db migration calls before start instead of 'on starting' callback (#381)

* connector cert fix  (#382)

* fixed production config & version 1.0.19 (#379)

Author: dbusel

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iofogcontroller",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "ioFog Controller project for Eclipse IoFog @ iofog.org \\nCopyright (c) 2018 Edgeworx, Inc.",
   "main": "./src/main.js",
   "author": "Saeid Baghbidi",

src/cli/start.js

@@ -14,9 +14,10 @@
 const BaseCLIHandler = require('./base-cli-handler');
 const config = require('../config');
 const logger = require('../logger');
+const db = require('../sequelize/models');
 
 class Start extends BaseCLIHandler {
-  run(args) {
+  async run(args) {
     const daemon = args.daemon;
     const configuration = {
       devMode: config.get('Server:DevMode'),
@@ -28,6 +29,13 @@ 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)
+      }
       daemon.start();
       checkDaemon(daemon, configuration)
     } else {

src/config/production.json

@@ -7,7 +7,7 @@
     "DevMode": true
   },
   "Email": {
-    "ActivationEnabled": true
+    "ActivationEnabled": false
   },
   "Settings": {
     "UserTokenExpirationIntervalSeconds": 3600,

src/main.js

@@ -18,7 +18,6 @@ if (!process.env.NODE_ENV) {
 }
 
 const daemonize = require('daemonize2');
-const db = require('./sequelize/models');
 const Cli = require('./cli');
 const logger = require('./logger');
 
@@ -35,14 +34,6 @@ function main() {
   daemon
     .on('starting', async () => {
       logger.silly('Starting iofog-controller...');
-
-      try {
-        await db.migrate();
-        await db.seed();
-      } catch (err) {
-        logger.silly('Unable to initialize the database.', err);
-        process.exit(1)
-      }
     })
     .on('stopping', () => {
       logger.silly('Stopping iofog-controller...')

src/services/microservices-service.js

@@ -394,11 +394,16 @@ async function _createRouteOverConnector(sourceMicroservice, destMicroservice, u
 
   const networkCatalogItem = await CatalogService.getNetworkCatalogItem(transaction)
 
+  let cert;
+  if (connector.cert) {
+    cert = AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8"))
+  }
+
   //create netw ms1
   const sourceNetwMsConfig = {
     'mode': 'private',
     'host': connector.domain,
-    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
+    'cert': cert,
     'port': ports.port1,
     'passcode': ports.passcode1,
     'connectioncount': 1,
@@ -420,7 +425,7 @@ async function _createRouteOverConnector(sourceMicroservice, destMicroservice, u
   const destNetwMsConfig = {
     'mode': 'private',
     'host': connector.domain,
-    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
+    'cert': cert,
     'port': ports.port2,
     'passcode': ports.passcode2,
     'connectioncount': 1,
@@ -616,11 +621,15 @@ async function _createPortMappingOverConnector(microservice, portMappingData, us
 
   const networkCatalogItem = await CatalogService.getNetworkCatalogItem(transaction)
 
+  let cert;
+  if (connector.cert) {
+    cert = AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8"));
+  }
   //create netw ms1
   const netwMsConfig = {
     'mode': 'public',
     'host': connector.domain,
-    'cert': AppHelper.trimCertificate(fs.readFileSync(connector.cert, "utf-8")),
+    'cert': cert,
     'port': ports.port1,
     'passcode': ports.passcode1,
     'connectioncount': 60,