[#84] fix pod build and update pod logs

builder/pod-build.go

@@ -2,7 +2,6 @@ package builder
 
 import (
 	"errors"
-	log "github.com/Sirupsen/logrus"
 	"github.com/appc/spec/schema"
 	"github.com/appc/spec/schema/types"
 	"github.com/blablacar/cnt/spec"
@@ -13,7 +12,7 @@ import (
 const PATH_POD_MANIFEST = "/pod-manifest.json"
 
 func (p *Pod) Build() error {
-	log.Info("Building POD : ", p.manifest.Name)
+	p.log.Info("Building")
 
 	os.RemoveAll(p.target)
 	os.MkdirAll(p.target, 0777)

builder/pod-clean.go

@@ -1,12 +1,11 @@
 package builder
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"os"
 )
 
 func (p *Pod) Clean() {
-	log.Info("Cleaning POD", p.manifest.Name)
+	p.log.Info("Cleaning")
 
 	if err := os.RemoveAll(p.target + "/"); err != nil {
 		panic("Cannot clean" + p.manifest.Name.String() + err.Error())
@@ -17,7 +16,7 @@ func (p *Pod) Clean() {
 	for _, e := range p.manifest.Pod.Apps {
 		aci, err := NewAciWithManifest(p.path+"/"+e.Name, p.args, p.toAciManifest(e), &checkVersion)
 		if err != nil {
-			panic(err)
+			p.log.WithError(err).WithField("name", e.Name).Fatal("Cannot prepare aci")
 		}
 		aci.podName = &p.manifest.Name
 		aci.Clean()

builder/pod-graph.go

@@ -2,13 +2,12 @@ package builder
 
 import (
 	"bytes"
-	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
 	"os"
 )
 
 func (p *Pod) Graph() {
-	log.Info("Graph POD", p.manifest.Name)
+	p.log.Info("Graphing")
 	os.MkdirAll(p.target, 0777)
 
 	var buffer bytes.Buffer

builder/pod-install.go

@@ -1,11 +1,7 @@
 package builder
 
-import (
-	log "github.com/Sirupsen/logrus"
-)
-
 func (p *Pod) Install() {
-	log.Info("Installing POD", p.manifest.Name)
+	p.log.Info("Installing")
 
 	p.Build()
 
@@ -14,7 +10,7 @@ func (p *Pod) Install() {
 	for _, e := range p.manifest.Pod.Apps {
 		aci, err := NewAciWithManifest(p.path+"/"+e.Name, p.args, p.toAciManifest(e), &checkVersion)
 		if err != nil {
-			panic(err)
+			p.log.WithError(err).WithField("name", e.Name).Fatal("Cannot prepare aci")
 		}
 		aci.podName = &p.manifest.Name
 		aci.Install()

builder/pod-push.go

@@ -1,13 +1,12 @@
 package builder
 
 import (
-	log "github.com/Sirupsen/logrus"
 	"github.com/blablacar/cnt/cnt"
 	"github.com/blablacar/cnt/utils"
 )
 
 func (p *Pod) Push() {
-	log.Info("Push POD", p.manifest.Name)
+	p.log.Info("Pushing")
 
 	p.Build()
 
@@ -16,7 +15,7 @@ func (p *Pod) Push() {
 	for _, e := range p.manifest.Pod.Apps {
 		aci, err := NewAciWithManifest(p.path+"/"+e.Name, p.args, p.toAciManifest(e), &checkVersion)
 		if err != nil {
-			panic(err)
+			p.log.WithError(err).WithField("name", e.Name).Fatal("Cannot prepare aci")
 		}
 		aci.podName = &p.manifest.Name
 		aci.Push()
@@ -37,7 +36,7 @@ func (p *Pod) Push() {
 		"-F", "file=@"+p.target+"/pod-manifest.json",
 		"-u", cnt.Home.Config.Push.Username+":"+cnt.Home.Config.Push.Password,
 		cnt.Home.Config.Push.Url+"/service/local/artifact/maven/content"); err != nil {
-		panic("Cannot push pod" + err.Error())
+		p.log.WithError(err).Fatal("Cannot push pod")
 	}
 
 }

builder/pod-test.go

@@ -1,18 +1,14 @@
 package builder
 
-import (
-	log "github.com/Sirupsen/logrus"
-)
-
 func (p *Pod) Test() {
-	log.Info("Testing POD", p.manifest.Name)
+	p.log.Info("Testing")
 
 	checkVersion := make(chan bool, 1)
 
 	for _, e := range p.manifest.Pod.Apps {
 		aci, err := NewAciWithManifest(p.path+"/"+e.Name, p.args, p.toAciManifest(e), &checkVersion)
 		if err != nil {
-			panic(err)
+			p.log.WithError(err).WithField("name", e.Name).Fatal("Cannot prepare aci")
 		}
 		aci.podName = &p.manifest.Name
 		aci.Test()

commands/cnt.go

@@ -94,7 +94,7 @@ func checkRktVersion() {
 func buildAciOrPod(path string, args builder.BuildArgs) spec.CntCommand {
 	if aci, err := builder.NewAci(path, args); err == nil {
 		return aci
-	} else if pod, err2 := builder.NewPod(path, args); err == nil {
+	} else if pod, err2 := builder.NewPod(path, args); err2 == nil {
 		return pod
 	} else {
 		logrus.WithField("path", path).WithError(err).WithField("error2", err2).Fatal("Cannot construct aci or pod")