* Improved tracing and logging, so check and checkFatal show the correct source location.

diff --git a/config.go b/config.go
index 1ce1ab9e99240061a859f420f63b44d341ca1ba1..969dfaf4d3676e6d1cb99c87e534128019ce43a6 100644 (file)
--- a/config.go
+++ b/config.go
@@ -145,7 +145,7 @@ func initialize() {
                cfg.idxpage = ""
        }
 
-       tracer.Print("Version: ", version)
+       tracer.Print("final config after evaluating command line:")
        tracer.Print("fqdn:    ", cfg.fqdn)
        tracer.Print("iface:   ", cfg.iface)
        tracer.Print("port:    ", cfg.port)
@@ -158,6 +158,7 @@ func initialize() {
        tracer.Print("indexes: ", cfg.indexes)
        tracer.Print("timeout: ", cfg.timeout)
        tracer.Print("verbose: ", cfg.verbose)
+       tracer.Print("gogopherd version ", version)
 }
 
 /* EOF */

diff --git a/util.go b/util.go
index 84be4f86fca7e2f92a1ca12c52b350bff01426f7..b31686fc459024276170b6b7e6d59593382969bd 100644 (file)
--- a/util.go
+++ b/util.go
@@ -17,34 +17,42 @@ import (
        "net/http"
        "os"
        "path/filepath"
+       "runtime"
        "strings"
        "time"
 )
 
 var (
        logger *log.Logger
+       loggex *log.Logger
        tracer *log.Logger
+       tracex *log.Logger
 )
 
 func initUtil(verbose bool) {
        logger = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile)
+       loggex = log.New(os.Stderr, "", log.Ldate|log.Ltime)
        if verbose {
                tracer = log.New(os.Stderr, "", log.Ldate|log.Ltime|log.Lshortfile)
+               tracex = log.New(os.Stderr, "", log.Ldate|log.Ltime)
        } else {
                tracer = log.New(ioutil.Discard, "", 0)
+               tracex = log.New(ioutil.Discard, "", 0)
        }
 }
 
 func checkFatal(err error, msg string) {
        if err != nil {
-               logger.Print(msg, ": ", err.Error())
+               _, file, line, _ := runtime.Caller(1)
+               loggex.Printf("%s:%d: %s %v\n", filepath.Base(file), line, msg, err)
                os.Exit(1)
        }
 }
 
 func check(err error, msg string) error {
-       if err != nil {
-               tracer.Print(msg, ": ", err.Error())
+       if err != nil && cfg.verbose {
+               _, file, line, _ := runtime.Caller(1)
+               tracex.Printf("%s:%d: %s %v\n", filepath.Base(file), line, msg, err)
        }
        return err
 }