From c36bc5a42f8900ac89895125b7f240311f2d4e38 Mon Sep 17 00:00:00 2001 From: Herbert Burzlaff Date: Thu, 2 May 2019 20:12:55 +0000 Subject: [PATCH 1/4] DEVOPS-151: Updating mongodb nodejs driver to 1.2.14 --- npm-shrinkwrap.json | 12 ++++++------ package.json.in | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 43f92c8..4c1cc70 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -8,14 +8,14 @@ "resolved": "https://registry.npmjs.org/easejs/-/easejs-0.2.9.tgz" }, "mongodb": { - "version": "1.2.8", - "from": "mongodb@1.2.8", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.2.8.tgz", + "version": "1.2.14", + "from": "mongodb@1.2.14", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz", "dependencies": { "bson": { - "version": "0.1.5", - "from": "bson@0.1.5", - "resolved": "https://registry.npmjs.org/bson/-/bson-0.1.5.tgz" + "version": "0.1.8", + "from": "bson@0.1.8", + "resolved": "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz" } } } diff --git a/package.json.in b/package.json.in index 24964d0..e2a6b6e 100644 --- a/package.json.in +++ b/package.json.in @@ -25,7 +25,7 @@ "dependencies": { "easejs": "0.2.x", - "mongodb": "1.2.8", + "mongodb": "1.2.14", "amqplib": "0.5.3" }, "devDependencies": { From 7ac88d6e5563f8bdb5a5efaf3baf570f118cee9a Mon Sep 17 00:00:00 2001 From: Herbert Burzlaff Date: Thu, 2 May 2019 16:44:45 -0400 Subject: [PATCH 2/4] DEVOPS-151: code changes to support mongodb HA (Replication) --- src/server/daemon/controller.js | 41 +++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/src/server/daemon/controller.js b/src/server/daemon/controller.js index 5bc9ce4..2206d5e 100644 --- a/src/server/daemon/controller.js +++ b/src/server/daemon/controller.js @@ -25,6 +25,7 @@ const { Db: MongoDb, Server: MongoServer, Connection: MongoConnection, + ReplSetServers: ReplSetServers, } = require( 'mongodb/lib/mongodb' ); const regex_base = /^\/quote\/([a-z0-9-]+)\/?(?:\/(\d+)\/?(?:\/(.*))?|\/(program.js))?$/; @@ -118,16 +119,7 @@ exports.post_rate_publish = {}; exports.init = function( logger, enc_service, conf ) { - var db = new MongoDb( - 'program', - new MongoServer( - process.env.MONGODB_HOST || '127.0.0.1', - +process.env.MONGODB_PORT || MongoConnection.DEFAULT_PORT, - { auto_reconnect: true } - ), - { native_parser: false, safe: false } - ); - + var db = _createDB( logger ); const dao = MongoServerDao( db ); _createDocumentServer( dao, logger, enc_service, conf ).then( srv => @@ -176,6 +168,35 @@ exports.init = function( logger, enc_service, conf ) } ); } +function _createDB( logger ) +{ + if(process.env.LIZA_MONGODB_HA==1) + { + var mongodbPort = process.env.MONGODB_PORT || MongoConnection.DEFAULT_PORT; + var mongodbReplSet = process.env.LIZA_MONGODB_REPLSET || 'rs0'; + var dbServers = new ReplSetServers( + [ + new MongoServer( process.env.LIZA_MONGODB_HOST_A, +process.env.LIZA_MONGODB_PORT_A || mongodbPort), + new MongoServer( process.env.LIZA_MONGODB_HOST_B, +process.env.LIZA_MONGODB_PORT_B || mongodbPort) + ], + {rs_name: mongodbReplSet, auto_reconnect: true} + ); + } + else + { + var dbServers = new MongoServer( + process.env.MONGODB_HOST || '127.0.0.1', + +process.env.MONGODB_PORT || MongoConnection.DEFAULT_PORT, + {auto_reconnect: true} + ); + } + var db = new MongoDb( + 'program', + dbServers, + {native_parser: false, safe: false, logger: logger} + ); + return db; +} function _createDocumentServer( dao, logger, enc_service, conf ) { From 06d928b17922cf3f03dcd959374ed7b306cbcd79 Mon Sep 17 00:00:00 2001 From: Herbert Burzlaff Date: Wed, 8 May 2019 17:10:47 -0400 Subject: [PATCH 3/4] Switching docker build image to node:4-stretch node:4 has issues with apt since debian made changes to the apt repo for jessie --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab63451..4a025c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:4 +image: node:4-stretch stages: - build From 6e336610d4736bd07b7c8e8377895be7a71ce1fc Mon Sep 17 00:00:00 2001 From: Herbert Burzlaff Date: Thu, 9 May 2019 08:57:48 -0400 Subject: [PATCH 4/4] DEVOPS-151 - gitlab-ci - Splitting up make commands so that the console output has the test (make check) results last --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a025c6..9a1b3ed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,9 @@ build: - autoreconf -fvi - ./configure --with-srcuri="$SRCURI" - npm install - - make all check info pdf html + - make all + - make info pdf html + - make check artifacts: paths: - doc/