rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-17 15:40:47 +00:00
Code Issues Releases Wiki Activity

Increase the loggings for service failures at boot time

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-11 20:43:00 +10:00
parent 3b4d73e106
commit 47261eab01
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
compose/reload.go
View File

@@ -15,23 +15,30 @@ import (
func LoadService(p *project.Project, cfg *config.CloudConfig, useNetwork bool, service string) error { func LoadService(p *project.Project, cfg *config.CloudConfig, useNetwork bool, service string) error {
bytes, err := network.LoadServiceResource(service, useNetwork, cfg) bytes, err := network.LoadServiceResource(service, useNetwork, cfg)
if err != nil { if err != nil {
log.Error(err)
return err return err
} }
m := map[interface{}]interface{}{} m := map[interface{}]interface{}{}
if err = yaml.Unmarshal(bytes, &m); err != nil { 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) m = adjustContainerNames(m)
bytes, err = yaml.Marshal(m) bytes, err = yaml.Marshal(m)
if err != nil { 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 { 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 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 := LoadService(p, cfg, *useNetwork, service); err != nil {
if err != network.ErrNoNetwork { if err != network.ErrNoNetwork {
log.Error(err) log.Errorf("Failed to load service(%s): %v", service, err)
} }
continue continue
} }
@@ -99,12 +106,12 @@ func projectReload(p *project.Project, useNetwork *bool, loadConsole bool, envir
if loadConsole { if loadConsole {
if err := loadConsoleService(cfg, p); err != nil { 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 { 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 return nil

6
util/network/network.go
View File

@@ -93,10 +93,10 @@ func loadFromNetwork(location string) ([]byte, error) {
updateDNSCache() updateDNSCache()
var resp *http.Response var resp *http.Response
log.Infof("LoadFromNetwork(%s)", location) log.Debugf("LoadFromNetwork(%s)", location)
resp, err = http.Get(location) resp, err = http.Get(location)
log.Debugf("LoadFromNetwork(%s) returned %v", resp) log.Debugf("LoadFromNetwork(%s) returned %v", location, resp)
log.Debugf("LoadFromNetwork(%s) error %v", err) log.Debugf("LoadFromNetwork(%s) error %v", location, err)
if err == nil { if err == nil {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {