etcd-io
/
dbtester
mirror of https://github.com/etcd-io/dbtester.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*: better logging

This commit is contained in:
Gyu-Ho Lee 2016-03-21 23:59:17 -07:00
parent 69e561853f
commit 95ad6a7627
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
agent/agent.go
View File

@ -130,7 +130,7 @@ func CommandFunc(cmd *cobra.Command, args []string) {
defer f.Close()
log.SetOutput(f)
log.Printf("gRPC serving: %s", globalFlags.GRPCPort)
log.Printf("gRPC serving %s", globalFlags.GRPCPort)
var (
grpcServer = grpc.NewServer()
sender = NewTransporterServer()
@ -179,20 +179,20 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
if !strings.HasPrefix(filepath.Base(r.MonitorResultPath), r.LogPrefix) {
r.MonitorResultPath = filepath.Join(filepath.Dir(r.MonitorResultPath), r.LogPrefix+"_"+filepath.Base(r.MonitorResultPath))
}
} else {
if !filepath.HasPrefix(r.DatabaseLogPath, globalFlags.WorkingDirectory) {
r.DatabaseLogPath = filepath.Join(globalFlags.WorkingDirectory, r.DatabaseLogPath)
}
if !filepath.HasPrefix(r.MonitorResultPath, globalFlags.WorkingDirectory) {
r.MonitorResultPath = filepath.Join(globalFlags.WorkingDirectory, r.MonitorResultPath)
}
}
log.Printf("Working directory: %s", globalFlags.WorkingDirectory)
if !filepath.HasPrefix(r.DatabaseLogPath, globalFlags.WorkingDirectory) {
r.DatabaseLogPath = filepath.Join(globalFlags.WorkingDirectory, r.DatabaseLogPath)
}
if !filepath.HasPrefix(r.MonitorResultPath, globalFlags.WorkingDirectory) {
r.MonitorResultPath = filepath.Join(globalFlags.WorkingDirectory, r.MonitorResultPath)
}
log.Printf("working directory: %s", globalFlags.WorkingDirectory)
log.Printf("etcd data directory: %s", etcdDataDir)
log.Printf("Zookeeper working directory: %s", zkWorkingDir)
log.Printf("Zookeeper data directory: %s", zkDataDir)
log.Printf("Database log path: %s", r.DatabaseLogPath)
log.Printf("Monitor result path: %s", r.MonitorResultPath)
log.Printf("zookeeper working directory: %s", zkWorkingDir)
log.Printf("zookeeper data directory: %s", zkDataDir)
log.Printf("database log path: %s", r.DatabaseLogPath)
log.Printf("monitor result path: %s", r.MonitorResultPath)
}
t.req = *r

2
control/control.go
View File

@ -136,7 +136,7 @@ func CommandFunc(cmd *cobra.Command, args []string) {
nreq.ZookeeperMyID = uint32(i + 1)
ep := globalFlags.AgentEndpoints[nreq.EtcdServerIndex]
log.Printf("%s to %s\n", req.Database, ep)
log.Printf("[%s] %s to %s\n", req.Operation, req.Database, ep)
conn, err := grpc.Dial(ep, grpc.WithInsecure())
if err != nil {
log.Printf("error %v when connecting to %s\n", err, ep)