itSimplify logging/fname. - tordam - A library for peer discovery inside the Tor network	Err	parazyd.org	70
hgit clone https://git.parazyd.org/tordam	URL:https://git.parazyd.org/tordam	parazyd.org	70
1Log	/git/tordam/log.gph	parazyd.org	70
1Files	/git/tordam/files.gph	parazyd.org	70
1Refs	/git/tordam/refs.gph	parazyd.org	70
1README	/git/tordam/file/README.md.gph	parazyd.org	70
1LICENSE	/git/tordam/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 439ac37956e6fdd745aa9de01011b4775628eeae	/git/tordam/commit/439ac37956e6fdd745aa9de01011b4775628eeae.gph	parazyd.org	70
1parent b28b13a0285e5459b23fc0b2ee42262f75efbf1a	/git/tordam/commit/b28b13a0285e5459b23fc0b2ee42262f75efbf1a.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Sun, 21 Mar 2021 12:18:15 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iSimplify logging/fname.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M logging.go                          |      22 +++++++---------------	Err	parazyd.org	70
i	Err	parazyd.org	70
i1 file changed, 7 insertions(+), 15 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/logging.go b/logging.go	/git/tordam/file/logging.go.gph	parazyd.org	70
it@@ -20,9 +20,8 @@ package tordam	Err	parazyd.org	70
i import (	Err	parazyd.org	70
i         "log"	Err	parazyd.org	70
i         "os"	Err	parazyd.org	70
i-        "path/filepath"	Err	parazyd.org	70
i+        "path"	Err	parazyd.org	70
i         "runtime"	Err	parazyd.org	70
i-        "strings"	Err	parazyd.org	70
i )	Err	parazyd.org	70
i 	Err	parazyd.org	70
i var (	Err	parazyd.org	70
it@@ -35,25 +34,18 @@ var (	Err	parazyd.org	70
i // It should be called from programs using the library, with something like:	Err	parazyd.org	70
i //  tordam.LogInit(os.Stdout)	Err	parazyd.org	70
i func LogInit(f *os.File) {	Err	parazyd.org	70
i-        inte = log.New(f, "(tordam) INTERNAL ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)	Err	parazyd.org	70
i-        warn = log.New(f, "(tordam) WARNING: ", log.Ldate|log.Ltime)	Err	parazyd.org	70
i-        info = log.New(f, "(tordam) INFO: ", log.Ldate|log.Ltime)	Err	parazyd.org	70
i+        inte = log.New(f, "INTERNAL ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)	Err	parazyd.org	70
i+        warn = log.New(f, "WARNING: ", log.Ldate|log.Ltime)	Err	parazyd.org	70
i+        info = log.New(f, "INFO: ", log.Ldate|log.Ltime)	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func fname() string {	Err	parazyd.org	70
i         pc, _, _, _ := runtime.Caller(2)	Err	parazyd.org	70
i-        fn := runtime.FuncForPC(pc)	Err	parazyd.org	70
i-	Err	parazyd.org	70
i-        var fnName string	Err	parazyd.org	70
i-	Err	parazyd.org	70
i-        if fn == nil {	Err	parazyd.org	70
i-                fnName = "?()"	Err	parazyd.org	70
i+        if fn := runtime.FuncForPC(pc); fn != nil {	Err	parazyd.org	70
i+                return path.Base(fn.Name()) + "()"	Err	parazyd.org	70
i         } else {	Err	parazyd.org	70
i-                dotName := filepath.Ext(fn.Name())	Err	parazyd.org	70
i-                fnName = strings.TrimLeft(dotName, ".") + "()"	Err	parazyd.org	70
i+                return "?()"	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i-	Err	parazyd.org	70
i-        return fnName	Err	parazyd.org	70
i }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func rpcWarn(msg string) {	Err	parazyd.org	70
.