From f04af68d3f70b6d8d6d65dfd96cc9a956e7153f3 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Wed, 10 Dec 2014 21:28:45 +0000
Subject: [PATCH] update file

---
 discovery/discovery.go | 6 +++---
 discovery/file/file.go | 9 ++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/discovery/discovery.go b/discovery/discovery.go
index 34c8eb3089..190021e778 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -30,7 +30,7 @@ func Register(scheme string, initFunc InitFunc) error {
 	if _, exists := discoveries[scheme]; exists {
 		return fmt.Errorf("scheme already registered %s", scheme)
 	}
-	fmt.Printf("Registering %q discovery service", scheme)
+	log.Debugf("Registering %q discovery service", scheme)
 	discoveries[scheme] = initFunc
 
 	return nil
@@ -43,8 +43,8 @@ func New(rawurl string) (DiscoveryService, error) {
 	}
 
 	if initFct, exists := discoveries[url.Scheme]; exists {
-		log.Debugf("Initialising %q discovery service with %q", url.Scheme, url.Host)
-		return initFct(url.Host)
+		log.Debugf("Initialising %q discovery service with %q", url.Scheme, url.Host+url.Path)
+		return initFct(url.Host + url.Path)
 	}
 
 	return nil, ErrNotSupported
diff --git a/discovery/file/file.go b/discovery/file/file.go
index af51141723..f9cce05587 100644
--- a/discovery/file/file.go
+++ b/discovery/file/file.go
@@ -27,7 +27,14 @@ func (s FileDiscoveryService) Fetch() ([]string, error) {
 		return nil, err
 	}
 
-	return strings.Split(string(data), "\n"), nil
+	lines := []string{}
+
+	for _, line := range strings.Split(string(data), "\n") {
+		if line != "" {
+			lines = append(lines, line)
+		}
+	}
+	return lines, nil
 }
 
 func (s FileDiscoveryService) Watch(heartbeat int) <-chan time.Time {