mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-29 04:07:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

update log interface

Browse Source
This commit is contained in:
Anton Kaliaev
2017-05-04 23:17:16 +04:00
parent d2a4b16b28
commit 1dc3629b1a
11 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example/block_aware/block_aware_app.go
+2 -2
View File
@@ -16,7 +16,7 @@ func main() {
abciPtr := flag.String("abci", "socket", "socket | grpc")
flag.Parse()
logger := log.NewTMLogger(os.Stdout)
logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
// Start the listener
srv, err := server.NewServer(*addrPtr, *abciPtr, NewChainAwareApplication())
@@ -24,7 +24,7 @@ func main() {
logger.Error(err.Error())
os.Exit(1)
}
srv.SetLogger(log.With(logger, "module", "abci-server"))
srv.SetLogger(logger.With("module", "abci-server"))
// Wait forever
cmn.TrapSignal(func() {
example/block_aware/block_aware_test.go
+2 -2
View File
@@ -19,7 +19,7 @@ func TestChainAware(t *testing.T) {
if err != nil {
t.Fatal(err)
}
srv.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
srv.SetLogger(log.TestingLogger().With("module", "abci-server"))
defer srv.Stop()
// Connect to the socket
@@ -27,7 +27,7 @@ func TestChainAware(t *testing.T) {
if err != nil {
t.Fatalf("Error starting socket client: %v", err.Error())
}
client.SetLogger(log.With(log.TestingLogger(), "module", "abci-client"))
client.SetLogger(log.TestingLogger().With("module", "abci-client"))
client.Start()
defer client.Stop()
example/dummy/dummy_test.go
+6 -7
View File
@@ -3,7 +3,6 @@ package dummy
import (
"bytes"
"io/ioutil"
"os"
"sort"
"testing"
@@ -213,13 +212,13 @@ func valsEqual(t *testing.T, vals1, vals2 []*types.Validator) {
func makeSocketClientServer(app types.Application, name string) (abcicli.Client, cmn.Service, error) {
// Start the listener
socket := cmn.Fmt("unix://%s.sock", name)
logger := log.NewTMLogger(os.Stdout)
logger := log.TestingLogger()
server, err := server.NewSocketServer(socket, app)
if err != nil {
return nil, nil, err
}
server.SetLogger(log.With(logger, "module", "abci-server"))
server.SetLogger(logger.With("module", "abci-server"))
// Connect to the socket
client, err := abcicli.NewSocketClient(socket, false)
@@ -227,7 +226,7 @@ func makeSocketClientServer(app types.Application, name string) (abcicli.Client,
server.Stop()
return nil, nil, err
}
client.SetLogger(log.With(logger, "module", "abci-client"))
client.SetLogger(logger.With("module", "abci-client"))
client.Start()
return client, server, err
@@ -236,21 +235,21 @@ func makeSocketClientServer(app types.Application, name string) (abcicli.Client,
func makeGRPCClientServer(app types.Application, name string) (abcicli.Client, cmn.Service, error) {
// Start the listener
socket := cmn.Fmt("unix://%s.sock", name)
logger := log.NewTMLogger(os.Stdout)
logger := log.TestingLogger()
gapp := types.NewGRPCApplication(app)
server, err := server.NewGRPCServer(socket, gapp)
if err != nil {
return nil, nil, err
}
server.SetLogger(log.With(logger, "module", "abci-server"))
server.SetLogger(logger.With("module", "abci-server"))
client, err := abcicli.NewGRPCClient(socket, true)
if err != nil {
server.Stop()
return nil, nil, err
}
client.SetLogger(log.With(logger, "module", "abci-client"))
client.SetLogger(logger.With("module", "abci-client"))
return client, server, err
}
example/example_test.go
+3 -3
View File
@@ -42,7 +42,7 @@ func testStream(t *testing.T, app types.Application) {
if err != nil {
t.Fatalf("Error starting socket server: %v", err.Error())
}
server.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
server.SetLogger(log.TestingLogger().With("module", "abci-server"))
defer server.Stop()
// Connect to the socket
@@ -50,7 +50,7 @@ func testStream(t *testing.T, app types.Application) {
if err != nil {
t.Fatalf("Error starting socket client: %v", err.Error())
}
client.SetLogger(log.With(log.TestingLogger(), "module", "abci-client"))
client.SetLogger(log.TestingLogger().With("module", "abci-client"))
client.Start()
defer client.Stop()
@@ -116,7 +116,7 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) {
if err != nil {
t.Fatalf("Error starting GRPC server: %v", err.Error())
}
server.SetLogger(log.With(log.TestingLogger(), "module", "abci-server"))
server.SetLogger(log.TestingLogger().With("module", "abci-server"))
defer server.Stop()
// Connect to the socket