From 4d497f1c6ecfe156b33c9558eb10e1c224b49175 Mon Sep 17 00:00:00 2001 From: Brian Tiger Chow Date: Sat, 22 Nov 2014 23:41:47 -0800 Subject: [PATCH] refactor(repo) mv ConfigureLogger to repo package License: MIT Signed-off-by: Brian Tiger Chow Conflicts: cmd/ipfs/main.go --- cmd/ipfs/main.go | 23 +---------------------- repo/logs.go | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 22 deletions(-) create mode 100644 repo/logs.go diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 0ca8044f2..8a30a9a71 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -278,7 +278,7 @@ func callPreCommandHooks(details cmdDetails, req cmds.Request, root *cmds.Comman if err != nil { return err } - configureEventLogger(cfg) + repo.ConfigureEventLogger(cfg.Logs) } return nil @@ -510,24 +510,3 @@ func allInterruptSignals() chan os.Signal { syscall.SIGTERM, syscall.SIGQUIT) return sigc } - -func configureEventLogger(config *config.Config) error { - - if u.Debug { - eventlog.Configure(eventlog.LevelDebug) - } else { - eventlog.Configure(eventlog.LevelInfo) - } - - eventlog.Configure(eventlog.LdJSONFormatter) - - rotateConf := eventlog.LogRotatorConfig{ - Filename: config.Logs.Filename, - MaxSizeMB: config.Logs.MaxSizeMB, - MaxBackups: config.Logs.MaxBackups, - MaxAgeDays: config.Logs.MaxAgeDays, - } - - eventlog.Configure(eventlog.OutputRotatingLogFile(rotateConf)) - return nil -} diff --git a/repo/logs.go b/repo/logs.go new file mode 100644 index 000000000..0ec141eee --- /dev/null +++ b/repo/logs.go @@ -0,0 +1,28 @@ +package repo + +import ( + util "github.com/jbenet/go-ipfs/util" + eventlog "github.com/jbenet/go-ipfs/util/eventlog" + config "github.com/jbenet/go-ipfs/config" +) + +func ConfigureEventLogger(config config.Logs) error { + + if util.Debug { + eventlog.Configure(eventlog.LevelDebug) + } else { + eventlog.Configure(eventlog.LevelInfo) + } + + eventlog.Configure(eventlog.LdJSONFormatter) + + rotateConf := eventlog.LogRotatorConfig{ + Filename: config.Filename, + MaxSizeMB: config.MaxSizeMB, + MaxBackups: config.MaxBackups, + MaxAgeDays: config.MaxAgeDays, + } + + eventlog.Configure(eventlog.OutputRotatingLogFile(rotateConf)) + return nil +}