* Moved utility initialization to util.go.

diff --git a/config.go b/config.go
index 3a91fd99b2629ac2e82e2328a5bf73ba54eb847a..545303323d4a7c4592e3abffac3102570cd7dd53 100644 (file)
--- 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 35f42b50d72b14805e44c11601ad790b61f90a50..f64875594729d07ee672c7e4268735a792236d29 100644 (file)
--- 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())