Add a combined write syncer to the disk logging for zap

uber · Apr 27, 2017 · 09720c3 · 09720c3
1 parent 7167c75
commit 09720c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/benchmarks/runner/main.go b/benchmarks/runner/main.go
@@ -100,6 +100,7 @@ func spawnGateway(dirName string) *exec.Cmd {
 		"metrics.m3.hostPort":    "127.0.0.1:8053",
 		"metrics.tally.service":  "bench-gateway",
 		"logger.fileName":        path.Join(logTempDir, "zanzibar.log"),
+		"logger.output":          "disk",
 		"clients.contacts.port":  8092,
 		"clients.googleNow.port": 8092,
 		"clients.baz.port":       8094,

diff --git a/runtime/gateway.go b/runtime/gateway.go
@@ -345,7 +345,12 @@ func (gateway *Gateway) setupLogger(config *StaticConfig) error {
 			return errors.Wrap(err, "Error opening log file")
 		}
 		gateway.loggerFile = loggerFile
-		output = loggerFile
+		if gateway.logWriter != nil {
+			writer := zap.CombineWriteSyncers(loggerFile, gateway.logWriter)
+			output = writer
+		} else {
+			output = loggerFile
+		}
 	}
 
 	zapLogger := zap.New(

diff --git a/test/lib/bench_gateway/bench_gateway.go b/test/lib/bench_gateway/bench_gateway.go
@@ -98,7 +98,8 @@ func CreateGateway(
 	}
 	seedConfig["tchannel.processName"] = "bench-gateway"
 	seedConfig["metrics.tally.service"] = "bench-gateway"
-	seedConfig["logger.output"] = "stdout"
+	seedConfig["logger.output"] = "disk"
+	seedConfig["logger.fileName"] = "zanzibar.log"
 
 	benchGateway := &BenchGateway{
 		httpClient: &http.Client{