Skip to content

Commit eba410a

Browse files
gyuhogyuho
committed
*: replace capnslog
Signed-off-by: Gyuho Lee <[email protected]>
1 parent 55bd383 commit eba410a

28 files changed

+393
-323
lines changed

‎Gopkg.toml

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
revision = "5b3c4e850e90a4cf6a20ebd46c8b32a0a3afcb9e"
1616

1717

18+
[[constraint]]
19+
name = "go.uber.org/zap"
20+
version = "v1.8.0"
21+
1822
[[constraint]]
1923
name = "github.com/gogo/protobuf"
2024
source = "https://github.com/gogo/protobuf"

‎agent/agent_cetcd.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"strings"
2121

2222
"github.com/coreos/dbtester/dbtesterpb"
23+
24+
"go.uber.org/zap"
2325
)
2426

2527
// startCetcd starts cetcd. This assumes that etcd is already started.
@@ -54,14 +56,14 @@ func startCetcd(fs *flags, t *transporterServer) error {
5456
cmd.Stderr = t.proxyDatabaseLogfile
5557
cs := fmt.Sprintf("%s %s", cmd.Path, flagString)
5658

57-
plog.Infof("starting database %q", cs)
59+
t.lg.Info("starting database", zap.String("command", cs))
5860
if err := cmd.Start(); err != nil {
5961
return err
6062
}
6163
t.proxyCmd = cmd
6264
t.proxyCmdWait = make(chan struct{})
6365
t.proxyPid = int64(cmd.Process.Pid)
66+
t.lg.Info("started database", zap.String("command", cs), zap.Int64("pid", t.pid))
6467

65-
plog.Infof("started database %q (PID: %d)", cs, t.pid)
6668
return nil
6769
}

‎agent/agent_consul.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"strings"
2222

2323
"github.com/coreos/dbtester/dbtesterpb"
24+
25+
"go.uber.org/zap"
2426
)
2527

2628
// startConsul starts Consul.
@@ -70,14 +72,14 @@ func startConsul(fs *flags, t *transporterServer) error {
7072
cmd.Stderr = t.databaseLogFile
7173
cs := fmt.Sprintf("%s %s", cmd.Path, flagString)
7274

73-
plog.Infof("starting database %q", cs)
75+
t.lg.Info("starting database", zap.String("command", cs))
7476
if err := cmd.Start(); err != nil {
7577
return err
7678
}
7779
t.cmd = cmd
7880
t.cmdWait = make(chan struct{})
7981
t.pid = int64(cmd.Process.Pid)
82+
t.lg.Info("started database", zap.String("command", cs), zap.Int64("pid", t.pid))
8083

81-
plog.Infof("started database %q (PID: %d)", cs, t.pid)
8284
return nil
8385
}

‎agent/agent_etcd.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import (
2121
"strings"
2222

2323
"github.com/coreos/dbtester/dbtesterpb"
24+
25+
"go.uber.org/zap"
2426
)
2527

2628
// startEtcd starts etcd v3.
@@ -137,14 +139,14 @@ func startEtcd(fs *flags, t *transporterServer) error {
137139
cmd.Stderr = t.databaseLogFile
138140
cs := fmt.Sprintf("%s %s", cmd.Path, flagString)
139141

140-
plog.Infof("starting database %q", cs)
142+
t.lg.Info("starting database", zap.String("command", cs))
141143
if err := cmd.Start(); err != nil {
142144
return err
143145
}
144146
t.cmd = cmd
145147
t.cmdWait = make(chan struct{})
146148
t.pid = int64(cmd.Process.Pid)
149+
t.lg.Info("started database", zap.String("command", cs), zap.Int64("pid", t.pid))
147150

148-
plog.Infof("started database %q (PID: %d)", cs, t.pid)
149151
return nil
150152
}

‎agent/agent_zetcd.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"strings"
2121

2222
"github.com/coreos/dbtester/dbtesterpb"
23+
24+
"go.uber.org/zap"
2325
)
2426

2527
// startZetcd starts zetcd. This assumes that etcd is already started.
@@ -54,14 +56,14 @@ func startZetcd(fs *flags, t *transporterServer) error {
5456
cmd.Stderr = t.proxyDatabaseLogfile
5557
cs := fmt.Sprintf("%s %s", cmd.Path, flagString)
5658

57-
plog.Infof("starting database %q", cs)
59+
t.lg.Info("starting database", zap.String("command", cs))
5860
if err := cmd.Start(); err != nil {
5961
return err
6062
}
6163
t.proxyCmd = cmd
6264
t.proxyCmdWait = make(chan struct{})
6365
t.proxyPid = int64(cmd.Process.Pid)
66+
t.lg.Info("started database", zap.String("command", cs), zap.Int64("pid", t.proxyPid))
6467

65-
plog.Infof("started database %q (PID: %d)", cs, t.pid)
6668
return nil
6769
}

‎agent/agent_zookeeper.go

+11-4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"strings"
2525

2626
"github.com/coreos/dbtester/dbtesterpb"
27+
28+
"go.uber.org/zap"
2729
)
2830

2931
var (
@@ -101,10 +103,15 @@ func startZookeeper(fs *flags, t *transporterServer) error {
101103
if t.req.Flag_Zookeeper_R3_5_3Beta == nil {
102104
return fmt.Errorf("request 'Flag_Zookeeper_R3_5_3Beta' is nil")
103105
}
104-
plog.Infof("writing Zookeeper myid file %d to %s", t.req.Flag_Zookeeper_R3_5_3Beta.MyID, ipath)
106+
t.lg.Info(
107+
"writing Zookeeper myid file",
108+
zap.Int("myid", int(t.req.Flag_Zookeeper_R3_5_3Beta.MyID)),
109+
zap.String("path", ipath),
110+
)
105111
if err := toFile(fmt.Sprintf("%d", t.req.Flag_Zookeeper_R3_5_3Beta.MyID), ipath); err != nil {
106112
return err
107113
}
114+
108115
default:
109116
return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID)
110117
}
@@ -136,7 +143,7 @@ func startZookeeper(fs *flags, t *transporterServer) error {
136143
return err
137144
}
138145
zctxt := buf.String()
139-
plog.Infof("writing Zookeeper config file %q (config %q)", fs.zkConfig, zctxt)
146+
t.lg.Info("writing Zookeeper config file", zap.String("path", fs.zkConfig))
140147
if err := toFile(zctxt, fs.zkConfig); err != nil {
141148
return err
142149
}
@@ -178,14 +185,14 @@ func startZookeeper(fs *flags, t *transporterServer) error {
178185
cmd.Stderr = t.databaseLogFile
179186
cs := fmt.Sprintf("%s %s", cmd.Path, strings.Join(args[1:], " "))
180187

181-
plog.Infof("starting database %q", cs)
188+
t.lg.Info("starting database", zap.String("command", cs))
182189
if err := cmd.Start(); err != nil {
183190
return err
184191
}
185192
t.cmd = cmd
186193
t.cmdWait = make(chan struct{})
187194
t.pid = int64(cmd.Process.Pid)
195+
t.lg.Info("started database", zap.String("command", cs), zap.Int64("pid", t.pid))
188196

189-
plog.Infof("started database %q (PID: %d)", cs, t.pid)
190197
return nil
191198
}

‎agent/command.go

+26-12
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
package agent
1616

1717
import (
18+
"fmt"
1819
"net"
1920
"os"
2021
"path/filepath"
2122

2223
"github.com/coreos/dbtester/dbtesterpb"
2324
"github.com/coreos/dbtester/pkg/ntp"
25+
"go.uber.org/zap"
2426

2527
"github.com/coreos/etcd/pkg/netutil"
26-
"github.com/coreos/pkg/capnslog"
2728
"github.com/gyuho/linux-inspect/df"
2829
"github.com/spf13/cobra"
2930
"google.golang.org/grpc"
@@ -58,11 +59,11 @@ var globalFlags flags
5859
func init() {
5960
dn, err := df.GetDevice("/")
6061
if err != nil {
61-
plog.Warningf("cannot get disk device mounted at '/' (%v)", err)
62+
fmt.Printf("cannot get disk device mounted at '/' (%v)\n", err)
6263
}
6364
nm, err := netutil.GetDefaultInterfaces()
6465
if err != nil {
65-
plog.Warningf("cannot detect default network interface (%v)", err)
66+
fmt.Printf("cannot detect default network interface (%v)\n", err)
6667
}
6768
var nt string
6869
for k := range nm {
@@ -102,26 +103,39 @@ var Command = &cobra.Command{
102103

103104
func commandFunc(cmd *cobra.Command, args []string) error {
104105
no, nerr := ntp.DefaultSync()
105-
plog.Infof("npt update output: %q", no)
106-
plog.Infof("npt update error: %v", nerr)
106+
fmt.Printf("npt update output: %q\n", no)
107+
if nerr != nil {
108+
fmt.Printf("npt update error: %v\n", nerr)
109+
}
107110

108-
f, err := openToAppend(globalFlags.agentLog)
109-
if err != nil {
110-
return err
111+
lcfg := zap.Config{
112+
Level: zap.NewAtomicLevelAt(zap.InfoLevel),
113+
Development: false,
114+
Sampling: &zap.SamplingConfig{
115+
Initial: 100,
116+
Thereafter: 100,
117+
},
118+
Encoding: "json",
119+
EncoderConfig: zap.NewProductionEncoderConfig(),
120+
121+
OutputPaths: []string{globalFlags.agentLog},
122+
ErrorOutputPaths: []string{globalFlags.agentLog},
123+
}
124+
lg, lerr := lcfg.Build()
125+
if lerr != nil {
126+
return lerr
111127
}
112-
defer f.Close()
113-
capnslog.SetFormatter(capnslog.NewPrettyFormatter(f, false))
114128

115129
var (
116130
grpcServer = grpc.NewServer()
117-
sender = NewServer()
131+
sender = NewServer(lg)
118132
)
119133
ln, err := net.Listen("tcp", globalFlags.grpcPort)
120134
if err != nil {
121135
return err
122136
}
123137
dbtesterpb.RegisterTransporterServer(grpcServer, sender)
124138

125-
plog.Infof("agent started with gRPC %s (log path %q)", globalFlags.grpcPort, globalFlags.agentLog)
139+
lg.Info("agent started", zap.String("grpc-server-port", globalFlags.grpcPort), zap.String("agent-log", globalFlags.agentLog))
126140
return grpcServer.Serve(ln)
127141
}

‎agent/logger.go

-19
This file was deleted.

0 commit comments

Comments
 (0)