From f3dba8b6f07962f77e2c61cdcc21908066c56aab Mon Sep 17 00:00:00 2001
From: Martin Donnelly <martind2000@gmail.com>
Date: Fri, 30 Sep 2016 16:45:02 +0100
Subject: [PATCH] =?UTF-8?q?=E2=80=9D2016-09-30=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mDotServer.censis/lib/server/db-connector.js | 15 +++++++++++++--
 .../mqttArchiver/lib/mqtt/mqttClient.js          | 16 +++-------------
 .../mqttArchiver/lib/server/db-connector.js      | 13 +++++++++++--
 mdot/mqttArchiver/mqttArchiver/package.json      |  3 ++-
 4 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js b/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
index e74c107..52c742d 100644
--- a/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
+++ b/mdot/mDotServer.censis/mDotServer.censis/lib/server/db-connector.js
@@ -19,15 +19,26 @@ var localCN = {
 
 // ElephantSql settings
 
-var remoteCN = {
+/*var remoteCN = {
   host: 'jumbo.db.elephantsql.com',
   port: 5432,
   database: 'amlrxqev',
   user: 'amlrxqev',
   password: 'K11cvCplk0--oNafsYj4ISN-rVQmVS3y'
+};*/
+
+
+var amazonCN = {
+  dbinstance:'CensisMDot',
+  host: 'censis.cew5a5td5ukl.eu-west-1.rds.amazonaws.com',
+  port: 5432,
+  database: 'mdot',
+  user: 'censis_Lm5zt9BYD',
+  password: '1bR9nJoC5cFRcO84lu5mzmA7MeKyRW'
 };
 
-const cn = process.env.NODE_ENV === 'production' ? remoteCN : localCN;
+const cn = process.env.NODE_ENV === 'production' ? amazonCN : localCN;
+
 
 
 exports.dbConnection = pgp(cn);
diff --git a/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js b/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
index e3244f6..ebfa33b 100644
--- a/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
+++ b/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
@@ -11,14 +11,6 @@ var requestify = require('requestify');
 var db = require('../server/db-connector').dbConnection;
 
 var dbSave = require('../server/db-save')(db);
-var pusher = require('../pusher');
-
-//var nano = require('nano')('http://martind2000:1V3D4m526i@localhost:5984');
-/*
- var nano = require('nano')('http://localhost:5984');
- var db_name = 'mqttarchive';
- var dbCouch = nano.use(db_name);
- */
 
 //let remoteHost = process.env.NODE_ENV === 'production' ? 'http://mdotserver.mybluemix.net/apiv2/message' : 'http://localhost:3011/apiv2/message';
 const remoteHost = process.env.NODE_ENV === 'production' ? 'http://ec2-52-211-111-57.eu-west-1.compute.amazonaws.com/apiv2/message' : 'http://localhost:3011/apiv2/message';
@@ -95,8 +87,7 @@ var watchDogTimeout = () => {
     'Watchdog timeout. Message has not been received for over 20 minutes.');
   logger.warn('Last received:' + lastReceived + 'Now:' + now);
 
-  pusher.push(
-    'Watchdog timeout. Message has not been received for over 20 Minutes. \n\nLast received:' + lastReceived + 'Now:' + now);
+
   wdTimedOut = true;
 };
 
@@ -131,7 +122,6 @@ var mqttClient = function() {
     // connected = true;
     logger.info('Connected to ', address);
 
-    pusher.push('Connected to ' + address);
     clearTimeout(watchDog);
     watchDog = setTimeout(watchDogTimeout, 1200000);
     lastReceived = new Date();
@@ -188,7 +178,7 @@ var mqttClient = function() {
         var now = new Date();
         var s = 'Receiving again :::\n\nLast received: ' + lastReceived + 'Now: ' + now + "\n\n" + message.toString();
         logger.warn(s);
-        pusher.push(s);
+
         wdTimedOut = false;
       }
       lastReceived = new Date();
@@ -205,7 +195,7 @@ var mqttClient = function() {
   this.getCount = function() {
     'use strict';
     return count;
-  }
+  };
 
 };
 
diff --git a/mdot/mqttArchiver/mqttArchiver/lib/server/db-connector.js b/mdot/mqttArchiver/mqttArchiver/lib/server/db-connector.js
index 0b2b92b..877476e 100644
--- a/mdot/mqttArchiver/mqttArchiver/lib/server/db-connector.js
+++ b/mdot/mqttArchiver/mqttArchiver/lib/server/db-connector.js
@@ -19,15 +19,24 @@ var localCN = {
 
 // ElephantSql settings
 
-var remoteCN = {
+/*var remoteCN = {
   host: 'jumbo.db.elephantsql.com',
   port: 5432,
   database: 'vmlcokon',
   user: 'vmlcokon',
   password: 'PQUYLiIW4M6r7SWyZevrES_rRAULYFkp'
+};*/
+
+var amazonCN = {
+  dbinstance:'CensisMDot',
+  host: 'censis.cew5a5td5ukl.eu-west-1.rds.amazonaws.com',
+  port: 5432,
+  database: 'mdot',
+  user: 'censis_Lm5zt9BYD',
+  password: '1bR9nJoC5cFRcO84lu5mzmA7MeKyRW'
 };
 
-const cn = process.env.NODE_ENV === 'production' ? remoteCN : localCN;
+const cn = process.env.NODE_ENV === 'production' ? amazonCN : localCN;
 
 
 exports.dbConnection = pgp(cn);
diff --git a/mdot/mqttArchiver/mqttArchiver/package.json b/mdot/mqttArchiver/mqttArchiver/package.json
index 05cdf1f..7d91ca8 100644
--- a/mdot/mqttArchiver/mqttArchiver/package.json
+++ b/mdot/mqttArchiver/mqttArchiver/package.json
@@ -6,7 +6,8 @@
   "private": true,
   "scripts": {
     "start": "node app.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "production": "NODE_ENV=production node app.js"
   },
   "dependencies": {
     "atob": "^2.0.3",