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

agent: clean up logs

This commit is contained in:
Gyu-Ho Lee 2016-03-23 09:13:30 -07:00
parent 2d9afef910
commit b2df4acbf4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
agent/agent.go
View File

@ -466,9 +466,6 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
if err := os.RemoveAll(consulConfigDir); err != nil { if err := os.RemoveAll(consulConfigDir); err != nil {
return nil, err return nil, err
} }
if err := os.MkdirAll(filepath.Join(consulConfigDir, "server"), 0777); err != nil {
return nil, err
}
f, err := openToAppend(t.req.DatabaseLogPath) f, err := openToAppend(t.req.DatabaseLogPath)
if err != nil { if err != nil {
return nil, err return nil, err
@ -489,10 +486,6 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
consulCfg.RetryJoin = joins consulCfg.RetryJoin = joins
if t.req.ServerIndex == 0 { // leader if t.req.ServerIndex == 0 { // leader
if err := os.MkdirAll(filepath.Join(consulConfigDir, "bootstrap"), 0777); err != nil {
return nil, err
}
bcfg := consulCfg bcfg := consulCfg
bcfg.Bootstrap = true bcfg.Bootstrap = true
bcfg.StartJoin = nil bcfg.StartJoin = nil
@ -503,7 +496,11 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
return nil, err return nil, err
} }
cc := buf.String() cc := buf.String()
log.Printf("Writing %q to %s", cc, consulConfigPathBootstrap) log.Printf("Writing %q to %s", cc, consulConfigPathBootstrap)
if err := os.MkdirAll(filepath.Join(consulConfigDir, "bootstrap"), 0777); err != nil {
return nil, err
}
if err := toFile(cc, consulConfigPathBootstrap); err != nil { if err := toFile(cc, consulConfigPathBootstrap); err != nil {
return nil, err return nil, err
} }
@ -520,11 +517,11 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
cmd := exec.Command(consulBinaryPath, flags...) cmd := exec.Command(consulBinaryPath, flags...)
cmd.Stdout = bf cmd.Stdout = bf
cmd.Stderr = bf cmd.Stderr = bf
log.Printf("Starting: %s %s", cmd.Path, flagString) log.Printf("Starting: %s %s", cmd.Path, flagString)
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, err return nil, err
} }
log.Printf("Starting: %s %s", cmd.Path, flagString)
go func() { go func() {
if err := cmd.Wait(); err != nil { if err := cmd.Wait(); err != nil {
log.Printf("%s %s cmd.Wait returned %v", cmd.Path, flagString, err) log.Printf("%s %s cmd.Wait returned %v", cmd.Path, flagString, err)
@ -541,6 +538,9 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
cc := buf.String() cc := buf.String()
log.Printf("Writing %q to %s", cc, consulConfigPath) log.Printf("Writing %q to %s", cc, consulConfigPath)
if err := os.MkdirAll(filepath.Join(consulConfigDir, "server"), 0777); err != nil {
return nil, err
}
if err := toFile(cc, consulConfigPath); err != nil { if err := toFile(cc, consulConfigPath); err != nil {
return nil, err return nil, err
} }