[gommon] Update gommon/log Fix #84

Gopkg.toml

@@ -29,6 +29,7 @@
   name = "github.com/google/go-github"
   branch = "master"
 
+# as a dywegb go project, testing out master branch of its dependencies is .. well integration test
 [[constraint]]
   name = "github.com/dyweb/gommon"
   branch = "master"

app/git/pkg.go

@@ -7,7 +7,7 @@ import (
 
 const appName = "git"
 
-var log = logutil.NewPackageLogger()
+var log, _ = logutil.NewPackageLoggerAndRegistry()
 
 func init() {
 	Ayi.RegisterAppFactory(appName, func(r Ayi.Registry) (Ayi.App, error) {

app/github/pkg.go

@@ -7,7 +7,7 @@ import (
 
 const appName = "github"
 
-var log = logutil.NewPackageLogger()
+var log, _ = logutil.NewPackageLoggerAndRegistry()
 
 func init() {
 	Ayi.RegisterAppFactory(appName, func(r Ayi.Registry) (Ayi.App, error) {

app/web/pkg.go

@@ -7,7 +7,7 @@ import (
 
 const appName = "web"
 
-var log = logutil.NewPackageLogger()
+var log, _ = logutil.NewPackageLoggerAndRegistry()
 
 func init() {
 	Ayi.RegisterAppFactory(appName, func(r Ayi.Registry) (Ayi.App, error) {

cmd/ayi/main.go

@@ -27,7 +27,8 @@ const (
 	configFile = ".ayi.yml"
 )
 
-var log = logutil.Registry
+var logReg = logutil.Registry()
+var log = logutil.Logger()
 
 var (
 	version   string
@@ -52,7 +53,7 @@ func Main() error {
 		icli.Name(myname),
 		icli.Description(mydesc),
 		icli.Version(buildInfo),
-		icli.LogRegistry(log),
+		icli.LogRegistry(logReg),
 	)
 	root := cli.Command()
 	// TODO: go.ice need to disable built in config flag

pkg.go

@@ -7,12 +7,12 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/dyweb/Ayi/config"
 	"github.com/dyweb/Ayi/util/logutil"
 	"github.com/dyweb/gommon/errors"
-	"github.com/dyweb/Ayi/config"
 )
 
-var log = logutil.NewPackageLogger()
+var log, _ = logutil.NewPackageLoggerAndRegistry()
 
 var (
 	appMu        sync.Mutex

util/logutil/pkg.go

@@ -5,17 +5,25 @@ import (
 	"github.com/dyweb/gommon/log"
 )
 
-// Registry is the root logger of Ayi application
-var Registry = log.NewApplicationLogger()
+const Project = "github.com/dyweb/Ayi"
 
-// NewPackageLogger create a new logger for the calling package using Registry as its parent
-func NewPackageLogger() *log.Logger {
-	l := log.NewPackageLoggerWithSkip(1)
-	Registry.AddChild(l)
-	return l
+var logger, registry = log.NewApplicationLoggerAndRegistry(Project)
+
+func Registry() *log.Registry {
+	return registry
+}
+
+func Logger() *log.Logger {
+	return logger
+}
+
+func NewPackageLoggerAndRegistry() (*log.Logger, *log.Registry) {
+	logger, child := log.NewPackageLoggerAndRegistryWithSkip(Project, 1)
+	registry.AddRegistry(child)
+	return logger, child
 }
 
 // add go.ice log registry as its child
 func init() {
-	Registry.AddChild(ilog.Registry)
+	registry.AddRegistry(ilog.Registry())
 }