diff --git a/consul/registration.js b/consul/registration.js index c79628d2c..b9f5c60b3 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);