1
0
mirror of https://github.com/rancher/os.git synced 2025-08-31 14:23:11 +00:00

Log all init func errors to console, and panic if we can't loadImage - if it happens, the system is undefined

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-04-15 13:15:43 +00:00
parent f38a4eadda
commit 2a6e06fdc6
2 changed files with 2 additions and 2 deletions

View File

@@ -16,7 +16,7 @@ func ChainCfgFuncs(cfg *CloudConfig, cfgFuncs ...CfgFunc) (*CloudConfig, error)
log.Debugf("[%d/%d] Starting", i+1, len(cfgFuncs))
var err error
if cfg, err = cfgFunc(cfg); err != nil {
log.Errorf("Failed [%d/%d] %d%%", i+1, len(cfgFuncs), ((i + 1) * 100 / len(cfgFuncs)))
log.Errorf("Failed [%d/%d] %s", i+1, len(cfgFuncs), err)
return cfg, err
}
log.Debugf("[%d/%d] Done %d%%", i+1, len(cfgFuncs), ((i + 1) * 100 / len(cfgFuncs)))

View File

@@ -84,7 +84,7 @@ func loadImages(cfg *config.CloudConfig) (*config.CloudConfig, error) {
log.Infof("Loading images from %s", inputFileName)
if _, err = client.ImageLoad(context.Background(), input, true); err != nil {
return cfg, err
log.Fatalf("FATAL: failed loading images from %s: %s", inputFileName, err)
}
log.Infof("Done loading images from %s", inputFileName)