fix(boot.go,git.go): use cookoo logging for debug logs

instead of mixing and matching

Author: arschles

boot.go

@@ -4,12 +4,13 @@ import (
 	"os"
 	"runtime"
 
+	cookoolog "github.com/Masterminds/cookoo/log"
 	"github.com/codegangsta/cli"
 	"github.com/deis/builder/fetcher"
 	"github.com/deis/builder/pkg"
 	"github.com/deis/builder/pkg/conf"
 	"github.com/deis/builder/pkg/gitreceive"
-	"github.com/deis/builder/pkg/log"
+	pkglog "github.com/deis/builder/pkg/log"
 	"github.com/deis/builder/pkg/sshd"
 )
 
@@ -24,9 +25,10 @@ func init() {
 
 func main() {
 	if os.Getenv("DEBUG") == "true" {
-		log.IsDebugging = true
+		pkglog.IsDebugging = true
+		cookoolog.Level = cookoolog.LogDebug
 	}
-	log.Debug("Running in debug mode")
+	pkglog.Debug("Running in debug mode")
 
 	app := cli.NewApp()
 
@@ -38,12 +40,12 @@ func main() {
 			Action: func(c *cli.Context) {
 				cnf := new(sshd.Config)
 				if err := conf.EnvConfig(serverConfAppName, cnf); err != nil {
-					log.Err("getting config for %s [%s]", serverConfAppName, err)
+					pkglog.Err("getting config for %s [%s]", serverConfAppName, err)
 					os.Exit(1)
 				}
-				log.Info("starting fetcher on port %d", cnf.FetcherPort)
+				pkglog.Info("starting fetcher on port %d", cnf.FetcherPort)
 				go fetcher.Serve(cnf.FetcherPort)
-				log.Info("starting SSH server on %s:%d", cnf.SSHHostIP, cnf.SSHHostPort)
+				pkglog.Info("starting SSH server on %s:%d", cnf.SSHHostIP, cnf.SSHHostPort)
 				os.Exit(pkg.Run(cnf.SSHHostIP, cnf.SSHHostPort, "boot"))
 			},
 		},
@@ -54,11 +56,11 @@ func main() {
 			Action: func(c *cli.Context) {
 				cnf := new(gitreceive.Config)
 				if err := conf.EnvConfig(gitReceiveConfAppName, cnf); err != nil {
-					log.Err("Error getting config for %s [%s]", gitReceiveConfAppName, err)
+					pkglog.Err("Error getting config for %s [%s]", gitReceiveConfAppName, err)
 					os.Exit(1)
 				}
 				if err := gitreceive.Run(cnf); err != nil {
-					log.Err("running git receive hook [%s]", err)
+					pkglog.Err("running git receive hook [%s]", err)
 					os.Exit(1)
 				}
 			},

pkg/git/git.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/Masterminds/cookoo"
 	"github.com/Masterminds/cookoo/log"
-	pkglog "github.com/deis/builder/pkg/log"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -62,7 +61,7 @@ func Receive(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 	fingerprint := p.Get("fingerprint", nil).(string)
 	user := p.Get("user", "").(string)
 
-	pkglog.Debug("receiving git repo name: %s, operation: %s, fingerprint: %s, user: %s", repoName, operation, fingerprint, user)
+	log.Debugf(c, "receiving git repo name: %s, operation: %s, fingerprint: %s, user: %s", repoName, operation, fingerprint, user)
 
 	repo, err := cleanRepoName(repoName)
 	if err != nil {
@@ -90,8 +89,8 @@ func Receive(c cookoo.Context, p *cookoo.Params) (interface{}, cookoo.Interrupt)
 	}
 	cmd.Env = append(cmd.Env, os.Environ()...)
 
-	pkglog.Debug("Working Dir: %s", cmd.Dir)
-	pkglog.Debug("Environment: %s", strings.Join(cmd.Env, ","))
+	log.Debugf(c, "Working Dir: %s", cmd.Dir)
+	log.Debugf(c, "Environment: %s", strings.Join(cmd.Env, ","))
 
 	plumbCommand(cmd, channel, &errbuff)
 
@@ -179,7 +178,7 @@ func createRepo(c cookoo.Context, repoPath, gitHome string) (bool, error) {
 		}
 
 		writePath := filepath.Join(repoPath, "hooks", "pre-receive")
-		pkglog.Debug("Writing pre-receive hook to %s", writePath)
+		log.Debugf(c, "Writing pre-receive hook to %s", writePath)
 		if err := ioutil.WriteFile(writePath, hookByteBuf.Bytes(), 0755); err != nil {
 			return false, fmt.Errorf("Cannot write pre-receive hook to %s (%s)", writePath, err)
 		}