.circleci/config.yml

@@ -0,0 +1,14 @@
+version: 2.1
+orbs:
+  ci-go: ipfs/ci-go@0.2.4
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - ci-go/build
+      - ci-go/lint
+      - ci-go/test
+      - ci-go/test:
+          race: true
+          name: "ci-go/test/race"

log.go

@@ -9,8 +9,6 @@ import (
 	"go.uber.org/zap"
 )
 
-var log = Logger("eventlog")
-
 // StandardLogger provides API compatibility with standard printf loggers
 // eg. go-logging
 type StandardLogger interface {

logbench_test.go

@@ -12,7 +12,10 @@ import (
 
 func BenchmarkSimpleInfo(b *testing.B) {
 	l := Logger("bench")
-	SetLogLevel("bench", "info")
+	err := SetLogLevel("bench", "info")
+	if err != nil {
+		b.Fatal(err)
+	}
 
 	b.ResetTimer()
 	b.ReportAllocs()
@@ -25,7 +28,10 @@ var logString = "String, IDK what to write, let's punch a keyboard. jkdlsjklfdjf
 
 func BenchmarkFormatInfo(b *testing.B) {
 	l := Logger("bench")
-	SetLogLevel("bench", "info")
+	err := SetLogLevel("bench", "info")
+	if err != nil {
+		b.Fatal(err)
+	}
 
 	b.ResetTimer()
 	b.ReportAllocs()
@@ -36,7 +42,10 @@ func BenchmarkFormatInfo(b *testing.B) {
 
 func BenchmarkFormatInfoMulti(b *testing.B) {
 	l := Logger("bench")
-	SetLogLevel("bench", "info")
+	err := SetLogLevel("bench", "info")
+	if err != nil {
+		b.Fatal(err)
+	}
 	var wg sync.WaitGroup
 
 	goroutines := 16

path_other.go

@@ -0,0 +1,11 @@
+//+build !windows
+
+package log
+
+import (
+	"path/filepath"
+)
+
+func normalizePath(p string) (string, error) {
+	return filepath.Abs(p)
+}

path_windows.go

@@ -0,0 +1,35 @@
+//+build windows
+
+package log
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+)
+
+func normalizePath(p string) (string, error) {
+	if p == "" {
+		return "", fmt.Errorf("path empty")
+	}
+	p, err := filepath.Abs(p)
+	if err != nil {
+		return "", err
+	}
+	// Is this _really_ an absolute path?
+	if !strings.HasPrefix(p, "\\\\") {
+		// It's a drive: path!
+		// Return a UNC path.
+		p = "\\\\%3F\\" + p
+	}
+
+	// This will return file:////?/c:/foobar
+	//
+	// Why? Because:
+	//  1. Go will choke on file://c:/ because the "domain" includes a :.
+	//  2. Windows will choke on file:///c:/ because the path will be
+	//     /c:/... which is _relative_ to the current drive.
+	//
+	// This path (a) has no "domain" and (b) starts with a slash. Yay!
+	return "file://" + filepath.ToSlash(p), nil
+}

setup.go

@@ -28,8 +28,7 @@ const (
 	envLogging    = "GOLOG_LOG_LEVEL"
 	envLoggingFmt = "GOLOG_LOG_FMT"
 
-	envLoggingFile = "GOLOG_FILE"         // /path/to/file
-	envTracingFile = "GOLOG_TRACING_FILE" // /path/to/file
+	envLoggingFile = "GOLOG_FILE" // /path/to/file
 )
 
 // ErrNoSuchLogger is returned when the util pkg is asked for a non existant logger
@@ -69,7 +68,11 @@ func SetupLogging() {
 	zapCfg.OutputPaths = []string{"stderr"}
 	// check if we log to a file
 	if logfp := os.Getenv(envLoggingFile); len(logfp) > 0 {
-		zapCfg.OutputPaths = append(zapCfg.OutputPaths, logfp)
+		if path, err := normalizePath(logfp); err != nil {
+			fmt.Fprintf(os.Stderr, "failed to resolve log path '%q', logging to stderr only: %s\n", logfp, err)
+		} else {
+			zapCfg.OutputPaths = append(zapCfg.OutputPaths, path)
+		}
 	}
 
 	// set the backend(s)
@@ -84,7 +87,7 @@ func SetupLogging() {
 		var err error
 		lvl, err = LevelFromString(logenv)
 		if err != nil {
-			fmt.Println("error setting log levels", err)
+			fmt.Fprintf(os.Stderr, "error setting log levels: %s\n", err)
 		}
 	}
 	zapCfg.Level.SetLevel(zapcore.Level(lvl))