From 155983095454c8f5ffcfcd154fd1dfb45b99de21 Mon Sep 17 00:00:00 2001
From: ylcai <ylcai@thoughtworks.com>
Date: Mon, 13 Jan 2020 21:02:48 +0800
Subject: [PATCH 1/2] OLMIS-6727:Nginx error when reload the config file
 occasionally when deregister, service should be deleted in the end.

---
 consul/registration.js | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/consul/registration.js b/consul/registration.js
index c79628d2c..0b7c4a0c0 100644
--- a/consul/registration.js
+++ b/consul/registration.js
@@ -174,16 +174,17 @@ function RegistrationService(host, port) {
 
   self.register = function(args) {
     console.log("Registering service...");
-    registrationBase(args, 'register');
+    registrationBase(args);
     console.log("Registration finished!");
   }
   self.deregister = function(args) {
     console.log("Deregistering service...");
-    registrationBase(args, 'deregister');
+    deregistrationBase(args);
     console.log("Deregistration finished!");
   }
 
-  function registrationBase(args, mode) {
+  function registrationBase(args) {
+    var mode = 'register';
     registerService(args.service, mode);
 
     if (args.raml) {
@@ -194,6 +195,20 @@ function RegistrationService(host, port) {
       registerPath(args.service, args.path, mode);
     }
   }
+
+  function deregistrationBase(args) {
+    var mode = 'deregister';
+    if (args.raml) {
+      registerRaml(args.service, args.raml, mode);
+    }
+
+    if (args.path) {
+      registerPath(args.service, args.path, mode);
+    }
+
+    registerService(args.service, mode);
+  }
+
   function registerService(service, mode) {
     service.ID = generateServiceId(service.Name);
 
@@ -379,8 +394,8 @@ function CommandLineResolver() {
     return false;
   }
 
-  var consulHost = process.env.CONSUL_HOST || 'consul';
-  var consulPort = process.env.CONSUL_PORT || '8500';
+  var consulHost = 'localhost';
+  var consulPort = '8500';
 
   if (!awaitConsul(consulHost, consulPort)) {
     throw new Error("The Consul service has not started up properly.");

From 8a386e963ec7d8cce5f2ff2893d27d5b74373cc5 Mon Sep 17 00:00:00 2001
From: ylcai <ylcai@thoughtworks.com>
Date: Wed, 15 Jan 2020 17:04:18 +0800
Subject: [PATCH 2/2] OLMIS-6727:Nginx error when reload the config file
 occasionally revert to original consulHost and consulPort

---
 consul/registration.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/consul/registration.js b/consul/registration.js
index 0b7c4a0c0..b9f5c60b3 100644
--- a/consul/registration.js
+++ b/consul/registration.js
@@ -394,8 +394,8 @@ function CommandLineResolver() {
     return false;
   }
 
-  var consulHost = 'localhost';
-  var consulPort = '8500';
+  var consulHost = process.env.CONSUL_HOST || 'consul';
+  var consulPort = process.env.CONSUL_PORT || '8500';
 
   if (!awaitConsul(consulHost, consulPort)) {
     throw new Error("The Consul service has not started up properly.");