rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 14:48:55 +00:00
Code Issues Releases Wiki Activity

Cleanup logging

Browse Source
This commit is contained in:
Darren Shepherd
2015-02-21 00:34:23 -07:00
parent d63c875d13
commit dc59b3c724
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/sysinit/sysinit.go
View File

@@ -101,10 +101,11 @@ func loadImages(cfg *config.Config) error {
defer input.Close()
log.Debugf("Loading images from %s", inputFileName)
log.Infof("Loading images from %s", inputFileName)
err = client.LoadImage(dockerClient.LoadImageOptions{
InputStream: input,
})
log.Infof("Done loading images from %s", inputFileName)
if err != nil {
return err
@@ -121,12 +122,11 @@ func runContainers(cfg *config.Config) error {
containerConfigs = []config.ContainerConfig{*cfg.RescueContainer}
}
for _, containerConfig := range containerConfigs {
for i, containerConfig := range containerConfigs {
container := docker.NewContainer(config.DOCKER_SYSTEM_HOST, &containerConfig)
container.Parse()
if util.Contains(cfg.Disable, containerConfig.Id) {
log.Debugf("%s is disabled : %v", containerConfig.Id, cfg.Disable)
log.Infof("%s is disabled : %v", containerConfig.Id, cfg.Disable)
continue
}
@@ -139,8 +139,8 @@ func runContainers(cfg *config.Config) error {
}
}
log.Infof("Running [%d/%d] %s", i+1, len(containerConfigs), containerConfig.Id)
container.StartAndWait()
log.Debugf("Running %s", containerConfig.Id)
if container.Err != nil {
log.Errorf("Failed to run %v: %v", containerConfig.Id, container.Err)