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

fix nil pointer panic

This commit is contained in:
Gyu-Ho Lee 2016-03-15 22:59:41 -07:00
parent 5b0edd1a32
commit 9b4d6c93e7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
agent/agent.go
View File

@ -233,12 +233,12 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
cmd.Stdin = nil cmd.Stdin = nil
cmd.Stdout = f cmd.Stdout = f
cmd.Stderr = f cmd.Stderr = f
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Starting: %s %s\n", cmd.Path, flagString) log.Printf("Starting: %s %s\n", cmd.Path, flagString)
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, err return nil, err
} }
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Started: %s [PID: %d]", cmd.Path, t.pid) log.Printf("Started: %s [PID: %d]", cmd.Path, t.pid)
processPID = t.pid processPID = t.pid
go func() { go func() {
@ -308,12 +308,12 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
cmd.Stdin = nil cmd.Stdin = nil
cmd.Stdout = f cmd.Stdout = f
cmd.Stderr = f cmd.Stderr = f
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Starting: %s %s\n", cmd.Path, strings.Join(args[1:], " ")) log.Printf("Starting: %s %s\n", cmd.Path, strings.Join(args[1:], " "))
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, err return nil, err
} }
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Started: %s [PID: %d]", cmd.Path, t.pid) log.Printf("Started: %s [PID: %d]", cmd.Path, t.pid)
processPID = t.pid processPID = t.pid
go func() { go func() {
@ -350,12 +350,12 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response
cmd.Stdin = nil cmd.Stdin = nil
cmd.Stdout = f cmd.Stdout = f
cmd.Stderr = f cmd.Stderr = f
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Restarting: %s\n", strings.Join(t.cmd.Args, " ")) log.Printf("Restarting: %s\n", strings.Join(t.cmd.Args, " "))
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
return nil, err return nil, err
} }
t.cmd = cmd
t.pid = cmd.Process.Pid
log.Printf("Restarted: %s [PID: %d]", cmd.Path, t.pid) log.Printf("Restarted: %s [PID: %d]", cmd.Path, t.pid)
processPID = t.pid processPID = t.pid
go func() { go func() {