Merge pull request #3348 from aledbf/services_directory_with_ttl

fix(publisher): use TTL in services application etcd directories

Author: aledbf

publisher/server/publisher.go

@@ -98,11 +98,13 @@ func (s *Server) publishContainer(container *docker.APIContainers, ttl time.Dura
 		appName := match[1]
 		appPath := fmt.Sprintf("%s/%s", appName, containerName)
 		keyPath := fmt.Sprintf("/deis/services/%s", appPath)
+		dirPath := fmt.Sprintf("/deis/services/%s", appName)
 		for _, p := range container.Ports {
 			port := strconv.Itoa(int(p.PublicPort))
 			hostAndPort := host + ":" + port
 			if s.IsPublishableApp(containerName) && s.IsPortOpen(hostAndPort) {
 				s.setEtcd(keyPath, hostAndPort, uint64(ttl.Seconds()))
+				s.updateDir(dirPath, uint64(ttl.Seconds()))
 				safeMap.Lock()
 				safeMap.data[container.ID] = appPath
 				safeMap.Unlock()
@@ -146,6 +148,7 @@ func (s *Server) IsPublishableApp(name string) bool {
 	return false
 }
 
+// IsPortOpen checks if the given port is accepting tcp connections
 func (s *Server) IsPortOpen(hostAndPort string) bool {
 	portOpen := false
 	conn, err := net.Dial("tcp", hostAndPort)
@@ -215,3 +218,12 @@ func (s *Server) removeEtcd(key string, recursive bool) {
 	}
 	log.Println("del", key)
 }
+
+// updateDir updates the given directory for a given ttl. It succeeds
+// only if the given directory already exists.
+func (s *Server) updateDir(directory string, ttl uint64) {
+	if _, err := s.EtcdClient.UpdateDir(directory, ttl); err != nil {
+		log.Println(err)
+	}
+	log.Println("updateDir", directory)
+}