From 9a6d19028277f84b1c8cf57cac1e50180a397f3f Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Mon, 1 May 2017 16:43:52 +0400 Subject: [PATCH] remove stdlog --- cmd/abci-cli/abci-cli.go | 13 +++++++++---- cmd/counter/main.go | 7 ++++--- cmd/dummy/main.go | 4 ++-- example/block_aware/block_aware_app.go | 7 ++++--- example/example_test.go | 9 ++++----- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/cmd/abci-cli/abci-cli.go b/cmd/abci-cli/abci-cli.go index 02fa32f0b..8a1ee2d16 100644 --- a/cmd/abci-cli/abci-cli.go +++ b/cmd/abci-cli/abci-cli.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "io" - stdlog "log" "os" "strings" @@ -37,6 +36,8 @@ type queryResponse struct { // client is a global variable so it can be reused by the console var client abcicli.Client +var logger log.Logger + func main() { //workaround for the cli library (https://github.com/urfave/cli/issues/565) @@ -130,19 +131,23 @@ func main() { app.Before = before err := app.Run(os.Args) if err != nil { - stdlog.Fatal(err.Error()) + logger.Error(err.Error()) + os.Exit(1) } } func before(c *cli.Context) error { + if logger == nil { + logger = log.NewTmLogger(os.Stdout) + } if client == nil { var err error client, err = abcicli.NewClient(c.GlobalString("address"), c.GlobalString("abci"), false) if err != nil { - stdlog.Fatal(err.Error()) + logger.Error(err.Error()) + os.Exit(1) } - logger := log.NewTmLogger(os.Stdout) client.SetLogger(log.With(logger, "module", "abci-client")) } return nil diff --git a/cmd/counter/main.go b/cmd/counter/main.go index 19fc0b8c5..8fd5b4cc5 100644 --- a/cmd/counter/main.go +++ b/cmd/counter/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - stdlog "log" "os" "github.com/tendermint/abci/example/counter" @@ -19,12 +18,14 @@ func main() { flag.Parse() app := counter.NewCounterApplication(*serialPtr) + logger := log.NewTmLogger(os.Stdout) + // Start the listener srv, err := server.NewServer(*addrPtr, *abciPtr, app) if err != nil { - stdlog.Fatal(err.Error()) + logger.Error(err.Error()) + os.Exit(1) } - logger := log.NewTmLogger(os.Stdout) srv.SetLogger(log.With(logger, "module", "abci-server")) // Wait forever diff --git a/cmd/dummy/main.go b/cmd/dummy/main.go index f462a34e0..92249a9be 100644 --- a/cmd/dummy/main.go +++ b/cmd/dummy/main.go @@ -2,7 +2,6 @@ package main import ( "flag" - stdlog "log" "os" "github.com/tendermint/abci/example/dummy" @@ -33,7 +32,8 @@ func main() { // Start the listener srv, err := server.NewServer(*addrPtr, *abciPtr, app) if err != nil { - stdlog.Fatal(err.Error()) + logger.Error(err.Error()) + os.Exit(1) } srv.SetLogger(log.With(logger, "module", "abci-server")) diff --git a/example/block_aware/block_aware_app.go b/example/block_aware/block_aware_app.go index c77052b35..8f4e3393e 100644 --- a/example/block_aware/block_aware_app.go +++ b/example/block_aware/block_aware_app.go @@ -2,7 +2,6 @@ package main import ( "flag" - stdlog "log" "os" "github.com/tendermint/abci/server" @@ -17,12 +16,14 @@ func main() { abciPtr := flag.String("abci", "socket", "socket | grpc") flag.Parse() + logger := log.NewTmLogger(os.Stdout) + // Start the listener srv, err := server.NewServer(*addrPtr, *abciPtr, NewChainAwareApplication()) if err != nil { - stdlog.Fatal(err.Error()) + logger.Error(err.Error()) + os.Exit(1) } - logger := log.NewTmLogger(os.Stdout) srv.SetLogger(log.With(logger, "module", "abci-server")) // Wait forever diff --git a/example/example_test.go b/example/example_test.go index d71a44e64..ca2bf0637 100644 --- a/example/example_test.go +++ b/example/example_test.go @@ -2,7 +2,6 @@ package example import ( "fmt" - stdlog "log" "net" "os" "reflect" @@ -44,7 +43,7 @@ func testStream(t *testing.T, app types.Application) { // Start the listener server, err := server.NewSocketServer("unix://test.sock", app) if err != nil { - stdlog.Fatal(cmn.Fmt("Error starting socket server: %v", err.Error())) + t.Fatalf("Error starting socket server: %v", err.Error()) } server.SetLogger(log.With(logger, "module", "abci-server")) defer server.Stop() @@ -52,7 +51,7 @@ func testStream(t *testing.T, app types.Application) { // Connect to the socket client, err := abcicli.NewSocketClient("unix://test.sock", false) if err != nil { - stdlog.Fatal(cmn.Fmt("Error starting socket client: %v", err.Error())) + t.Fatalf("Error starting socket client: %v", err.Error()) } client.SetLogger(log.With(logger, "module", "abci-client")) client.Start() @@ -120,7 +119,7 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) { // Start the listener server, err := server.NewGRPCServer("unix://test.sock", app) if err != nil { - stdlog.Fatal(cmn.Fmt("Error starting GRPC server: %v", err.Error())) + t.Fatalf("Error starting GRPC server: %v", err.Error()) } server.SetLogger(log.With(logger, "module", "abci-server")) defer server.Stop() @@ -128,7 +127,7 @@ func testGRPCSync(t *testing.T, app *types.GRPCApplication) { // Connect to the socket conn, err := grpc.Dial("unix://test.sock", grpc.WithInsecure(), grpc.WithDialer(dialerFunc)) if err != nil { - stdlog.Fatal(cmn.Fmt("Error dialing GRPC server: %v", err.Error())) + t.Fatalf("Error dialing GRPC server: %v", err.Error()) } defer conn.Close()