github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1231 from brendandburns/service

Browse Source 
Fix a bug where we don't return an error.
This commit is contained in:
Daniel Smith 2014-09-09 12:48:19 -07:00
commit 1fd12778eb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/proxy/config/etcd.go
View File

@ -120,10 +120,12 @@ func (s ConfigSourceEtcd) Run() {
func (s ConfigSourceEtcd) GetServices() ([]api.Service, []api.Endpoints, error) { func (s ConfigSourceEtcd) GetServices() ([]api.Service, []api.Endpoints, error) {
response, err := s.client.Get(registryRoot+"/specs", true, false) response, err := s.client.Get(registryRoot+"/specs", true, false)
if err != nil { if err != nil {
glog.V(1).Infof("Failed to get the key %s: %v", registryRoot, err)
if tools.IsEtcdNotFound(err) { if tools.IsEtcdNotFound(err) {
return []api.Service{}, []api.Endpoints{}, err glog.V(1).Infof("Failed to get the key %s: %v", registryRoot, err)
} else {
glog.Errorf("Failed to contact etcd for key %s: %v", registryRoot, err)
} }
return []api.Service{}, []api.Endpoints{}, err
} }
if response.Node.Dir == true { if response.Node.Dir == true {
retServices := make([]api.Service, len(response.Node.Nodes)) retServices := make([]api.Service, len(response.Node.Nodes))