Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: logdog/client/cmd/logdog_butler/subcommand_run.go

Issue 2737603003: Butler stream servers can generate client address. (Closed)
Patch Set: better comment Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: logdog/client/cmd/logdog_butler/subcommand_run.go
diff --git a/logdog/client/cmd/logdog_butler/subcommand_run.go b/logdog/client/cmd/logdog_butler/subcommand_run.go
index 1ef0b6a6e80e5d0b596c6f2624579fdd65f441a9..3288a2800f1b5eae3f7048f66f7151dc0f794548 100644
--- a/logdog/client/cmd/logdog_butler/subcommand_run.go
+++ b/logdog/client/cmd/logdog_butler/subcommand_run.go
@@ -178,16 +178,20 @@ func (cmd *runCommandRun) Run(app subcommands.Application, args []string, _ subc
}
// Configure stream server
- streamServer := streamserver.StreamServer(nil)
+ var streamServer streamserver.StreamServer
streamServerOwned := true
if cmd.streamServerURI != "" {
log.Fields{
"url": cmd.streamServerURI,
}.Infof(a, "Creating stream server.")
- streamServer = createStreamServer(a, cmd.streamServerURI)
+ var err error
+ if streamServer, err = createStreamServer(a, cmd.streamServerURI); err != nil {
+ log.WithError(err).Errorf(a, "Failed to create stream server.")
+ return runtimeErrorReturnCode
+ }
if err := streamServer.Listen(); err != nil {
- log.Errorf(log.SetError(a, err), "Failed to connect to stream server.")
+ log.WithError(err).Errorf(a, "Failed to connect to stream server.")
return runtimeErrorReturnCode
}
defer func() {
@@ -196,7 +200,7 @@ func (cmd *runCommandRun) Run(app subcommands.Application, args []string, _ subc
}
}()
- bsEnv.StreamServerURI = string(cmd.streamServerURI)
+ bsEnv.StreamServerURI = streamServer.Address()
}
// Build our command enviornment.
« no previous file with comments | « logdog/client/cmd/logdog_butler/main_windows.go ('k') | logdog/client/cmd/logdog_butler/subcommand_serve.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698