diff --git a/compose/reload.go b/compose/reload.go index 32b4ed8c..92f31a5c 100644 --- a/compose/reload.go +++ b/compose/reload.go @@ -15,23 +15,30 @@ import ( func LoadService(p *project.Project, cfg *config.CloudConfig, useNetwork bool, service string) error { bytes, err := network.LoadServiceResource(service, useNetwork, cfg) if err != nil { + log.Error(err) return err } m := map[interface{}]interface{}{} if err = yaml.Unmarshal(bytes, &m); err != nil { - return fmt.Errorf("Failed to parse YAML configuration for %s: %v", service, err) + e := fmt.Errorf("Failed to parse YAML configuration for %s: %v", service, err) + log.Error(e) + return e } m = adjustContainerNames(m) bytes, err = yaml.Marshal(m) if err != nil { - return fmt.Errorf("Failed to marshal YAML configuration for %s: %v", service, err) + e := fmt.Errorf("Failed to marshal YAML configuration for %s: %v", service, err) + log.Error(e) + return e } if err = p.Load(bytes); err != nil { - return fmt.Errorf("Failed to load %s: %v", service, err) + e := fmt.Errorf("Failed to load %s: %v", service, err) + log.Error(e) + return e } return nil @@ -85,7 +92,7 @@ func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, envir if err := LoadService(p, cfg, *useNetwork, service); err != nil { if err != network.ErrNoNetwork { - log.Error(err) + log.Errorf("Failed to load service(%s): %v", service, err) } continue } @@ -99,12 +106,12 @@ func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, envir if loadConsole { if err := loadConsoleService(cfg, p); err != nil { - log.Errorf("Failed to load console: %v", err) + log.Errorf("Failed to load gancher.console=(%s): %v", cfg.Rancher.Console, err) } } if err := loadEngineService(cfg, p); err != nil { - log.Errorf("Failed to load engine: %v", err) + log.Errorf("Failed to load rancher.docker.engine=(%s): %v", cfg.Rancher.Docker.Engine, err) } return nil diff --git a/util/network/network.go b/util/network/network.go index 327b14c1..c00f741e 100644 --- a/util/network/network.go +++ b/util/network/network.go @@ -93,10 +93,10 @@ func loadFromNetwork(location string) ([]byte, error) { updateDNSCache() var resp *http.Response - log.Infof("LoadFromNetwork(%s)", location) + log.Debugf("LoadFromNetwork(%s)", location) resp, err = http.Get(location) - log.Debugf("LoadFromNetwork(%s) returned %v", resp) - log.Debugf("LoadFromNetwork(%s) error %v", err) + log.Debugf("LoadFromNetwork(%s) returned %v", location, resp) + log.Debugf("LoadFromNetwork(%s) error %v", location, err) if err == nil { defer resp.Body.Close() if resp.StatusCode != http.StatusOK {