Merge pull request #8 from johnrengelman/remove-port-number

Don't append port numbers if we already have a specific name.
cabrinoob · Mar 28, 2017 · 59f2de0 · 59f2de0
2 parents b57caaf + 5c9db44
commit 59f2de0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -5,6 +5,7 @@ var DockerEvents = require('docker-events'),
 var emitter = new DockerEvents({
     docker: new Dockerode({socketPath: '/var/run/docker.sock'}),
 });
+var jsonQuery = require('json-query')
 
 var _prefix = process.env.SVC_PREFIX || "";
 var _consulAgent = process.env.LOCAL_CONSUL_AGENT || "http://localhost:8500";
@@ -376,13 +377,15 @@ function registerService(input){
 
                 var id = input.metadata.uuid + ":" + pm.publicPort;
                 var name = _prefix + input.metadata.service_name;
+                var hasPortName = false;
                 if (input.metadata.port_service_names[pm.privatePort] != undefined) {
                   name = _prefix + input.metadata.port_service_names[pm.privatePort]
+                  hasPortName = true;
                 }
                 if (pm.transport == "udp")
                     id += ":udp";
 
-                if (input.metadata.portMapping.length > 1)
+                if (input.metadata.portMapping.length > 1 && !hasPortName)
                     name += "-" + pm.privatePort;
 
                 var definition = {

diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "async": "^2.1.4",
     "docker-events": "^0.0.2",
     "dockerode": "^2.3.1",
+    "json-query": "^2.2.0",
     "request": "^2.79.0"
   },
   "devDependencies": {},