Merge pull request #2492 from anshulpundir/bug

dperny · web-flow · commit 68a376dc30d8 · 2018-01-26T16:15:26.000-08:00
[agent] Minor fix for session log to be in the correct place
diff --git a/agent/session.go b/agent/session.go
@@ -65,12 +65,14 @@ func newSession(ctx context.Context, agent *Agent, delay time.Duration, sessionI
 		grpc.WithTransportCredentials(agent.config.Credentials),
 		grpc.WithTimeout(dispatcherRPCTimeout),
 	)
-	log.G(ctx).Infof("manager selected by agent for new session: %v", cc.Peer())
 
 	if err != nil {
 		s.errs <- err
 		return s
 	}
+
+	log.G(ctx).Infof("manager selected by agent for new session: %v", cc.Peer())
+
 	s.conn = cc
 
 	go s.run(sessionCtx, delay, description)

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,14 @@ func newSession(ctx context.Context, agent *Agent, delay time.Duration, sessionI`
`65`	`65`	`grpc.WithTransportCredentials(agent.config.Credentials),`
`66`	`66`	`grpc.WithTimeout(dispatcherRPCTimeout),`
`67`	`67`	`)`
`68`		`- log.G(ctx).Infof("manager selected by agent for new session: %v", cc.Peer())`
`69`	`68`
`70`	`69`	`if err != nil {`
`71`	`70`	`s.errs <- err`
`72`	`71`	`return s`
`73`	`72`	`}`
	`73`	`+`
	`74`	`+ log.G(ctx).Infof("manager selected by agent for new session: %v", cc.Peer())`
	`75`	`+`
`74`	`76`	`s.conn = cc`
`75`	`77`
`76`	`78`	`go s.run(sessionCtx, delay, description)`