deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #74 from janetkuo/error-output

Browse Source 
Correctly log error
This commit is contained in:
Janet Kuo 2016-08-03 12:40:02 -07:00 committed by GitHub
commit c6d137f0f3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cli/app/app.go
View File

@ -738,12 +738,12 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
} }
buf, err := ioutil.ReadFile(file) buf, err := ioutil.ReadFile(file)
if err != nil { if err != nil {
logrus.Fatalf("Failed to read bundles file: ", err) logrus.Fatalf("Failed to read bundles file: %v", err)
} }
reader := strings.NewReader(string(buf)) reader := strings.NewReader(string(buf))
bundle, err := bundlefile.LoadFile(reader) bundle, err := bundlefile.LoadFile(reader)
if err != nil { if err != nil {
logrus.Fatalf("Failed to parse bundles file: ", err) logrus.Fatalf("Failed to parse bundles file: %v", err)
} }
for name, service := range bundle.Services { for name, service := range bundle.Services {
@ -757,19 +757,19 @@ func loadBundlesFile(file string, opt convertOptions) KomposeObject {
image, err := loadImage(service) image, err := loadImage(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load image from bundles file: " + err) logrus.Fatalf("Failed to load image from bundles file: %v", err)
} }
serviceConfig.Image = image serviceConfig.Image = image
envs, err := loadEnvVars(service) envs, err := loadEnvVars(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load envvar from bundles file: " + err) logrus.Fatalf("Failed to load envvar from bundles file: %v", err)
} }
serviceConfig.Environment = envs serviceConfig.Environment = envs
ports, err := loadPorts(service) ports, err := loadPorts(service)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load ports from bundles file: " + err) logrus.Fatalf("Failed to load ports from bundles file: %v", err)
} }
serviceConfig.Port = ports serviceConfig.Port = ports
@ -816,7 +816,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
composeObject := project.NewProject(&context.Context, nil, nil) composeObject := project.NewProject(&context.Context, nil, nil)
err := composeObject.Parse() err := composeObject.Parse()
if err != nil { if err != nil {
logrus.Fatalf("Failed to load compose file", err) logrus.Fatalf("Failed to load compose file: %v", err)
} }
// transform composeObject into komposeObject // transform composeObject into komposeObject
@ -837,7 +837,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
// load ports // load ports
ports, err := loadPortsFromCompose(composeServiceConfig.Ports) ports, err := loadPortsFromCompose(composeServiceConfig.Ports)
if err != "" { if err != "" {
logrus.Fatalf("Failed to load ports from compose file: " + err) logrus.Fatalf("Failed to load ports from compose file: %v", err)
} }
serviceConfig.Port = ports serviceConfig.Port = ports
@ -848,7 +848,7 @@ func loadComposeFile(file string, opt convertOptions) KomposeObject {
labels := composeServiceConfig.Labels labels := composeServiceConfig.Labels
if labels != nil { if labels != nil {
if err := labels.UnmarshalYAML("", labels); err != nil { if err := labels.UnmarshalYAML("", labels); err != nil {
logrus.Fatalf("Failed to load labels from compose file: ", err) logrus.Fatalf("Failed to load labels from compose file: %v", err)
} }
} }
serviceConfig.Labels = labels serviceConfig.Labels = labels
@ -1044,7 +1044,7 @@ func komposeConvert(komposeObject KomposeObject, opt convertOptions) {
if opt.createChart { if opt.createChart {
err := generateHelm(opt.inputFile, svcnames, opt.generateYaml, opt.createD, opt.createDS, opt.createRC, opt.outFile) err := generateHelm(opt.inputFile, svcnames, opt.generateYaml, opt.createD, opt.createDS, opt.createRC, opt.outFile)
if err != nil { if err != nil {
logrus.Fatalf("Failed to create Chart data: %s\n", err) logrus.Fatalf("Failed to create Chart data: %v", err)
} }
} }