From e5536857726327832c0d62d1df439b40ce7875d9 Mon Sep 17 00:00:00 2001 From: Martin/Geno Date: Wed, 27 Feb 2019 02:25:16 +0100 Subject: [PATCH] not export logging stdout / stderr hook --- cmd/serve.go | 9 +++++++++ main.go | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 2b1f6486..30777b80 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -9,6 +9,7 @@ import ( "github.com/bdlm/log" "github.com/spf13/cobra" + "github.com/FreifunkBremen/yanic/database" allDatabase "github.com/FreifunkBremen/yanic/database/all" allOutput "github.com/FreifunkBremen/yanic/output/all" "github.com/FreifunkBremen/yanic/respond" @@ -16,6 +17,14 @@ import ( "github.com/FreifunkBremen/yanic/webserver" ) +// ServeConfig represents the whole configuration +type ServeConfig struct { + Respondd respond.Config + Webserver webserver.Config + Nodes runtime.NodesConfig + Database database.Config +} + // serveCmd represents the serve command var serveCmd = &cobra.Command{ Use: "serve", diff --git a/main.go b/main.go index 6e63ad24..86e67187 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,9 @@ import ( "github.com/FreifunkBremen/yanic/cmd" ) -type Hook struct{} +type hook struct{} -func (hook *Hook) Fire(entry *log.Entry) error { +func (h *hook) Fire(entry *log.Entry) error { switch entry.Level { case log.PanicLevel: entry.Logger.Out = os.Stderr @@ -31,12 +31,12 @@ func (hook *Hook) Fire(entry *log.Entry) error { return nil } -func (hook *Hook) Levels() []stdLogger.Level { +func (h *hook) Levels() []stdLogger.Level { return log.AllLevels } func main() { - log.AddHook(&Hook{}) + log.AddHook(&hook{}) cmd.Execute() }