From b38ea519a32269d381ff14e114e2f3d82f4cf943 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Wed, 23 Mar 2016 04:54:42 -0700 Subject: [PATCH] agent: run Consul with agent --- agent/agent.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index b49f2160..c7d68e17 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -266,7 +266,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response processPID = t.pid go func() { if err := cmd.Wait(); err != nil { - log.Printf("Start(%s) cmd.Wait returned %v", cmd.Path, err) + log.Printf("%s cmd.Wait returned %v", cmd.Path, err) return } log.Printf("Exiting %s", cmd.Path) @@ -327,7 +327,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response processPID = t.pid go func() { if err := cmd.Wait(); err != nil { - log.Printf("Start(%s) cmd.Wait returned %v", cmd.Path, err) + log.Printf("%s cmd.Wait returned %v", cmd.Path, err) return } log.Printf("Exiting %s", cmd.Path) @@ -401,7 +401,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response processPID = t.pid go func() { if err := cmd.Wait(); err != nil { - log.Printf("Start(%s) cmd.Wait returned %v", cmd.Path, err) + log.Printf("%s cmd.Wait returned %v", cmd.Path, err) return } log.Printf("Exiting %s", cmd.Path) @@ -431,6 +431,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response } } flags := []string{ + "agent", "-server", "-node", names[t.req.ServerIndex], "-data-dir", consulDataDir, @@ -454,7 +455,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response processPID = t.pid go func() { if err := cmd.Wait(); err != nil { - log.Printf("Start(%s) cmd.Wait returned %v", cmd.Path, err) + log.Printf("%s cmd.Wait returned %v", cmd.Path, err) return } log.Printf("Exiting %s", cmd.Path) @@ -495,7 +496,7 @@ func (t *transporterServer) Transfer(ctx context.Context, r *Request) (*Response processPID = t.pid go func() { if err := cmd.Wait(); err != nil { - log.Printf("Restart(%s) cmd.Wait returned %v", cmd.Path, err) + log.Printf("%s cmd.Wait returned %v", cmd.Path, err) return } log.Printf("Exiting %s", cmd.Path)