Reviewers: mp+158445_code.launchpad.net,

Message:
Please take a look.

Description:
deuglify logging for main packages.

Removed "cmd/juju*: " badge from all commands.

https://code.launchpad.net/~dimitern/juju-core/032-deuglify-logging-for-main-packages/+merge/158445

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/8674043/

Affected files:
   A [revision details]
   M cmd/juju/publish.go
   M cmd/juju/ssh.go
   M cmd/juju/synctools.go
   M cmd/jujud/agent.go
   M cmd/jujud/machine.go
   cmd/jujud/unit.go
   M cmd/jujud/upgrade.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:  
<email address hidden>
+New revision:  
<email address hidden>

Index: cmd/juju/publish.go
=== modified file 'cmd/juju/publish.go'
--- cmd/juju/publish.go	2013-04-09 18:52:24 +0000
+++ cmd/juju/publish.go	2013-04-11 17:51:37 +0000
@@ -117,7 +117,7 @@
  	if err != nil {
  		return fmt.Errorf("cannot obtain local digest: %v", err)
  	}
-	log.Infof("cmd/juju: local digest is %s", localDigest)
+	log.Infof("local digest is %s", localDigest)

  	ch, err := charm.ReadDir(branch.Location())
  	if err != nil {
@@ -131,7 +131,7 @@
  	if _, ok := err.(*charm.NotFoundError); ok {
  		oldEvent, err = charm.Store.Event(curl, "")
  		if _, ok := err.(*charm.NotFoundError); ok {
-			log.Infof("cmd/juju: charm %s is not yet in the store", curl)
+			log.Infof("charm %s is not yet in the store", curl)
  			err = nil
  		}
  	}
@@ -143,13 +143,13 @@
  		return handleEvent(ctx, curl, oldEvent)
  	}

-	log.Infof("cmd/juju: sending charm to the charm store...")
+	log.Infof("sending charm to the charm store...")

  	err = branch.Push(&bzr.PushAttr{Location: pushLocation, Remember: true})
  	if err != nil {
  		return err
  	}
-	log.Infof("cmd/juju: charm sent; waiting for it to be published...")
+	log.Infof("charm sent; waiting for it to be published...")
  	for {
  		time.Sleep(c.pollDelay)
  		newEvent, err := charm.Store.Event(curl, "")
@@ -175,7 +175,7 @@
  	switch event.Kind {
  	case "published":
  		curlRev := curl.WithRevision(event.Revision)
-		log.Infof("cmd/juju: charm published at %s as %s", event.Time, curlRev)
+		log.Infof("charm published at %s as %s", event.Time, curlRev)
  		fmt.Fprintln(ctx.Stdout, curlRev)
  	case "publish-error":
  		return fmt.Errorf("charm could not be published: %s",  
strings.Join(event.Errors, "; "))


Index: cmd/juju/ssh.go
=== modified file 'cmd/juju/ssh.go'
--- cmd/juju/ssh.go	2013-03-27 15:42:49 +0000
+++ cmd/juju/ssh.go	2013-04-11 17:51:37 +0000
@@ -72,13 +72,13 @@
  func (c *SSHCommon) hostFromTarget(target string) (string, error) {
  	// is the target the id of a machine ?
  	if state.IsMachineId(target) {
-		log.Infof("cmd/juju: looking up address for machine %s...", target)
+		log.Infof("looking up address for machine %s...", target)
  		// TODO(dfc) maybe we should have machine.PublicAddress() ?
  		return c.machinePublicAddress(target)
  	}
  	// maybe the target is a unit ?
  	if state.IsUnitName(target) {
-		log.Infof("cmd/juju: looking up address for unit %q...", c.Target)
+		log.Infof("looking up address for unit %q...", c.Target)
  		unit, err := c.State.Unit(target)
  		if err != nil {
  			return "", err


Index: cmd/juju/synctools.go
=== modified file 'cmd/juju/synctools.go'
--- cmd/juju/synctools.go	2013-04-10 22:58:37 +0000
+++ cmd/juju/synctools.go	2013-04-11 17:51:37 +0000
@@ -78,7 +78,7 @@
  	if err != nil {
  		return err
  	}
-	log.Infof("cmd/juju: downloaded %v (%dkB), uploading", toolsPath,  
(nBytes+512)/1024)
+	log.Infof("downloaded %v (%dkB), uploading", toolsPath, (nBytes+512)/1024)
  	fmt.Fprintf(ctx.Stderr, ", download %dkB, uploading\n", (nBytes+512)/1024)

  	if err := target.Put(toolsPath, buf, nBytes); err != nil {
@@ -92,7 +92,7 @@
  	target environs.Storage, dryRun bool, ctx *cmd.Context,
  ) error {
  	for _, tool := range tools {
-		log.Infof("cmd/juju: copying %s from %s", tool.Binary, tool.URL)
+		log.Infof("copying %s from %s", tool.Binary, tool.URL)
  		if dryRun {
  			continue
  		}
@@ -106,7 +106,7 @@
  func (c *SyncToolsCommand) Run(ctx *cmd.Context) error {
  	officialEnviron, err := environs.NewFromAttrs(officialBucketAttrs)
  	if err != nil {
-		log.Errorf("cmd/juju: failed to initialize the official bucket  
environment")
+		log.Errorf("failed to initialize the official bucket environment")
  		return err
  	}
  	fmt.Fprintf(ctx.Stderr, "listing the source bucket\n")
@@ -116,7 +116,7 @@
  	}
  	targetEnv, err := environs.NewFromName(c.EnvName)
  	if err != nil {
-		log.Errorf("cmd/juju: unable to read %q from environment", c.EnvName)
+		log.Errorf("unable to read %q from environment", c.EnvName)
  		return err
  	}
  	toolsToCopy := sourceToolsList.Public
@@ -126,7 +126,7 @@
  	fmt.Fprintf(ctx.Stderr, "found %d tools in source (%d recent ones)\n",
  		len(sourceToolsList.Public), len(toolsToCopy))
  	for _, tool := range toolsToCopy {
-		log.Debugf("cmd/juju: found source tool: %s", tool)
+		log.Debugf("found source tool: %s", tool)
  	}
  	fmt.Fprintf(ctx.Stderr, "listing target bucket\n")
  	targetToolsList, err := environs.ListTools(targetEnv,  
version.Current.Major)
@@ -134,7 +134,7 @@
  		return err
  	}
  	for _, tool := range targetToolsList.Private {
-		log.Debugf("cmd/juju: found target tool: %s", tool)
+		log.Debugf("found target tool: %s", tool)
  	}
  	targetTools := targetToolsList.Private
  	targetStorage := targetEnv.Storage()


Index: cmd/jujud/agent.go
=== modified file 'cmd/jujud/agent.go'
--- cmd/jujud/agent.go	2013-04-05 13:47:17 +0000
+++ cmd/jujud/agent.go	2013-04-11 17:51:37 +0000
@@ -71,7 +71,7 @@
  		select {
  		case info := <-done:
  			if info.err != nil {
-				log.Errorf("cmd/jujud: %s: %v", tasks[info.index], info.err)
+				log.Errorf("%s: %v", tasks[info.index], info.err)
  				logged[info.index] = true
  				err = info.err
  				break waiting
@@ -85,7 +85,7 @@
  	for i, t := range tasks {
  		err1 := t.Stop()
  		if !logged[i] && err1 != nil {
-			log.Errorf("cmd/jujud: %s: %v", t, err1)
+			log.Errorf("%s: %v", t, err1)
  			logged[i] = true
  		}
  		if moreImportant(err1, err) {
@@ -131,25 +131,25 @@
  // runLoop repeatedly calls runOnce until it returns  
worker.ErrTerminateAgent
  // or an upgraded error, or a value is received on stop.
  func runLoop(runOnce func() error, stop <-chan struct{}) error {
-	log.Noticef("cmd/jujud: agent starting")
+	log.Noticef("agent starting")
  	for {
  		err := runOnce()
  		if err == worker.ErrTerminateAgent {
-			log.Noticef("cmd/jujud: entity is terminated")
+			log.Noticef("entity is terminated")
  			return nil
  		}
  		if isFatal(err) {
  			return err
  		}
  		if err == nil {
-			log.Errorf("cmd/jujud: agent died with no error")
+			log.Errorf("agent died with no error")
  		} else {
-			log.Errorf("cmd/jujud: %v", err)
+			log.Errorf("%v", err)
  		}
  		if !isleep(retryDelay, stop) {
  			return nil
  		}
-		log.Noticef("cmd/jujud: rerunning agent")
+		log.Noticef("rerunning agent")
  	}
  	panic("unreachable")
  }


Index: cmd/jujud/machine.go
=== modified file 'cmd/jujud/machine.go'
--- cmd/jujud/machine.go	2013-04-10 13:42:09 +0000
+++ cmd/jujud/machine.go	2013-04-11 17:51:37 +0000
@@ -61,7 +61,7 @@
  		return err
  	}
  	charm.CacheDir = filepath.Join(a.Conf.DataDir, "charmcache")
-	defer log.Noticef("cmd/jujud: machine agent exiting")
+	defer log.Noticef("machine agent exiting")
  	defer a.tomb.Done()

  	// We run the API server worker first, because we may
@@ -105,7 +105,7 @@

  func (a *MachineAgent) RunOnce(st *state.State, e AgentState) error {
  	m := e.(*state.Machine)
-	log.Infof("cmd/jujud: jobs for machine agent: %v", m.Jobs())
+	log.Infof("jobs for machine agent: %v", m.Jobs())
  	tasks := []task{
  		NewUpgrader(st, m, a.Conf.DataDir),
  		machiner.NewMachiner(st, m.Id()),
@@ -123,7 +123,7 @@
  			// Ignore because it's started independently.
  			continue
  		default:
-			log.Warningf("cmd/jujud: ignoring unknown job %q", j)
+			log.Warningf("ignoring unknown job %q", j)
  		}
  	}
  	return runTasks(a.tomb.Dying(), tasks...)
@@ -138,7 +138,7 @@
  	if !m.CheckProvisioned(a.Conf.MachineNonce) {
  		// The agent is running on a different machine to the one it
  		// should be according to state. It must stop immediately.
-		log.Errorf("cmd/jujud: running machine %v agent on inappropriate  
instance", m)
+		log.Errorf("running machine %v agent on inappropriate instance", m)
  		return nil, worker.ErrTerminateAgent
  	}
  	return m, nil
@@ -190,7 +190,7 @@
  	if len(conf.StateServerCert) == 0 || len(conf.StateServerKey) == 0 {
  		return &fatalError{"configuration does not have state server cert/key"}
  	}
-	log.Infof("cmd/jujud: running API server job")
+	log.Infof("running API server job")
  	srv, err := apiserver.NewServer(st, fmt.Sprintf(":%d", conf.APIPort),  
conf.StateServerCert, conf.StateServerKey)
  	if err != nil {
  		return err
@@ -198,7 +198,7 @@
  	select {
  	case <-a.tomb.Dying():
  	case <-srv.Dead():
-		log.Noticef("jujud: API server has died: %v", srv.Stop())
+		log.Noticef("API server has died: %v", srv.Stop())
  	}
  	return srv.Stop()
  }


Index: cmd/jujud/unit.go
=== modified file 'cmd/jujud/unit.go'
--- cmd/jujud/unit.go	2013-03-25 15:34:57 +0000
+++ cmd/jujud/unit.go	2013-04-11 17:51:37 +0000
@@ -53,7 +53,7 @@
  	if err := a.Conf.read(state.UnitTag(a.UnitName)); err != nil {
  		return err
  	}
-	defer log.Noticef("cmd/jujud: unit agent exiting")
+	defer log.Noticef("unit agent exiting")
  	defer a.tomb.Done()
  	err := RunAgentLoop(a.Conf.Conf, a)
  	if ug, ok := err.(*UpgradeReadyError); ok {


Index: cmd/jujud/upgrade.go
=== modified file 'cmd/jujud/upgrade.go'
--- cmd/jujud/upgrade.go	2013-03-25 15:34:57 +0000
+++ cmd/jujud/upgrade.go	2013-04-11 17:51:37 +0000
@@ -47,7 +47,7 @@
  	if err != nil {
  		return err
  	}
-	log.Infof("cmd/jujud: upgrader upgraded from %v to %v (%q)",  
e.OldTools.Binary, tools.Binary, tools.URL)
+	log.Infof("upgrader upgraded from %v to %v (%q)", e.OldTools.Binary,  
tools.Binary, tools.URL)
  	return nil
  }

@@ -95,7 +95,7 @@
  		// Don't abort everything because we can't find the tools directory.
  		// The problem should sort itself out as we will immediately
  		// download some more tools and upgrade.
-		log.Warningf("cmd/jujud: upgrader cannot read current tools: %v", err)
+		log.Warningf("upgrader cannot read current tools: %v", err)
  		currentTools = &state.Tools{
  			Binary: version.Current,
  		}
@@ -146,13 +146,13 @@
  			if environ == nil {
  				environ, err = environs.New(cfg)
  				if err != nil {
-					log.Errorf("cmd/jujud: upgrader loaded invalid initial environment  
configuration: %v", err)
+					log.Errorf("upgrader loaded invalid initial environment  
configuration: %v", err)
  					break
  				}
  			} else {
  				err = environ.SetConfig(cfg)
  				if err != nil {
-					log.Warningf("cmd/jujud: upgrader loaded invalid environment  
configuration: %v", err)
+					log.Warningf("upgrader loaded invalid environment configuration: %v",  
err)
  					// continue on, because the version number is still significant.
  				}
  			}
@@ -188,7 +188,7 @@
  			}
  			tools, err := environs.FindTools(environ, binary, flags)
  			if err != nil {
-				log.Errorf("cmd/jujud: upgrader error finding tools for %v: %v",  
binary, err)
+				log.Errorf("upgrader error finding tools for %v: %v", binary, err)
  				noDelay()
  				// TODO(rog): poll until tools become available.
  				break
@@ -196,18 +196,18 @@
  			if tools.Binary != binary {
  				if tools.Number == version.Current.Number {
  					// TODO(rog): poll until tools become available.
-					log.Warningf("cmd/jujud: upgrader: version %v requested but found  
only current version: %v", binary, tools.Number)
+					log.Warningf("upgrader: version %v requested but found only current  
version: %v", binary, tools.Number)
  					noDelay()
  					break
  				}
-				log.Warningf("cmd/jujud: upgrader cannot find exact tools match  
for %s; using %s instead", binary, tools.Binary)
+				log.Warningf("upgrader cannot find exact tools match for %s; using %s  
instead", binary, tools.Binary)
  			}
  			if tools, err := agent.ReadTools(u.dataDir, tools.Binary); err == nil {
  				// The best available tools have already been downloaded, so use them.
  				return u.upgradeReady(currentTools, tools)
  			}

-			log.Infof("cmd/jujud: upgrader downloading %q", tools.URL)
+			log.Infof("upgrader downloading %q", tools.URL)
  			download = downloader.New(tools.URL, "")
  			downloadTools = tools
  			downloadDone = download.Done()
@@ -215,17 +215,17 @@
  			tools := downloadTools
  			download, downloadTools, downloadDone = nil, nil, nil
  			if status.Err != nil {
-				log.Errorf("cmd/jujud: upgrader download of %v failed: %v",  
tools.Binary, status.Err)
+				log.Errorf("upgrader download of %v failed: %v", tools.Binary,  
status.Err)
  				noDelay()
  				break
  			}
  			err := agent.UnpackTools(u.dataDir, tools, status.File)
  			status.File.Close()
  			if err := os.Remove(status.File.Name()); err != nil {
-				log.Warningf("cmd/jujud: upgrader cannot remove temporary download  
file: %v", err)
+				log.Warningf("upgrader cannot remove temporary download file: %v", err)
  			}
  			if err != nil {
-				log.Errorf("cmd/jujud: upgrader cannot unpack %v tools: %v",  
tools.Binary, err)
+				log.Errorf("upgrader cannot unpack %v tools: %v", tools.Binary, err)
  				noDelay()
  				break
  			}