From 6b581add760f480b2618c661a302bd0c5a7772fd Mon Sep 17 00:00:00 2001 From: Urban Wallasch Date: Fri, 5 Apr 2019 16:24:56 +0200 Subject: [PATCH] * Moved utility initialization to util.go. --- config.go | 10 +--------- util.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config.go b/config.go index 3a91fd9..5453033 100644 --- a/config.go +++ b/config.go @@ -11,8 +11,6 @@ package main import ( "flag" "fmt" - "io/ioutil" - "log" "os" ) @@ -57,13 +55,7 @@ func initialize() { os.Exit(1) } - logger = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile) - if cfg.verbose { - tracer = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile) - } else { - tracer = log.New(ioutil.Discard, "", 0) - } - pathSep = string(os.PathSeparator) + initUtil(cfg.verbose) var err error cfg.docRoot, err = canonicalizePath(cfg.docRoot) diff --git a/util.go b/util.go index 35f42b5..f648755 100644 --- a/util.go +++ b/util.go @@ -12,6 +12,7 @@ import ( "errors" "fmt" "io" + "io/ioutil" "log" "net/http" "os" @@ -25,6 +26,16 @@ var ( pathSep string ) +func initUtil(verbose bool) { + logger = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile) + if verbose { + tracer = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile) + } else { + tracer = log.New(ioutil.Discard, "", 0) + } + pathSep = string(os.PathSeparator) +} + func checkFatal(err error, msg string) { if err != nil { logger.Print(msg, ": ", err.Error()) -- 2.30.2