Merge pull request #559 from Optum/master

R1.1.0

Author: johnlegeyt

Dockerfile

@@ -12,7 +12,10 @@ RUN mkdir -p /app
 COPY . /app
 WORKDIR /app
 
+
+
 # install app dependencies
+RUN npm config set registry https://repo1.uhc.com/artifactory/api/npm/npm-virtual/ 
 RUN npm install
 RUN npm install -g bower
 RUN bower install --allow-root
@@ -21,4 +24,4 @@ RUN bower install --allow-root
 RUN mkdir /.pm2 && chmod 777 /.pm2 && chmod 777 /app
 
 # start app
-CMD npm run serve
+CMD npm run serve

controllers/serviceController.js

@@ -943,7 +943,9 @@ function updateService(req, res) {
         }
 
         res.json(newService);
-        syncWorkers(newService, 'register');
+        //syncWorkers(newService, 'register');
+        //fixed for issue - stopped service gives response if you update a service. even when it is stopped in database.
+        syncWorkers(newService, service.running ? 'register' : 'deregister');
       });
     }else{
       const query = { $or: [ { 'service._id': req.params.id }, { 'mqservice._id': req.params.id } ] };

lib/wsdl/parser.js

@@ -42,7 +42,7 @@ function parse(wsdl) {
           rr.payloadType = 'XML';
 
           // set req / res headers
-          contentType = { 'Content-Type': 'text/xml' };
+          const contentType = { 'Content-Type': 'text/xml' };
           rr.reqHeaders = contentType;
           rr.resHeaders = contentType;
 

models/http/Service.js

@@ -71,7 +71,14 @@ const serviceSchema = new mongoose.Schema({
   },
   defaultResponse: {
     enabled:Boolean,
-    defaultResponsePayload : String
+    defaultResponsePayload : String,
+    defResStatus : {
+      // force integer only
+      type: Number,
+      default: 404,
+      get: function(v) { return Math.round(v); },
+      set: function(v) { return Math.round(v); }
+    }
   },
   liveInvocation: {
     enabled: Boolean,