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

Unified Diff: logdog/client/butler/streamserver/base.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
« no previous file with comments | « logdog/client/butler/butler_test.go ('k') | logdog/client/butler/streamserver/base_test.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: logdog/client/butler/streamserver/base.go
diff --git a/logdog/client/butler/streamserver/base.go b/logdog/client/butler/streamserver/base.go
index 1e30635fdc16b32744c6fc7814df3de7657689f7..caa1ed6dcadeeb336b81b7f69f1a763acac4fe9c 100644
--- a/logdog/client/butler/streamserver/base.go
+++ b/logdog/client/butler/streamserver/base.go
@@ -32,10 +32,15 @@ type streamParams struct {
type listenerStreamServer struct {
context.Context
+ // address is the string returned by the Address method.
+ address string
+
// gen is a generator function that is called to produce the stream server's
// Listener. On success, it returns the instantiated Listener, which will be
// closed when the stream server is closed.
- gen func() (net.Listener, error)
+ //
+ // The string returned is the address for this server.
+ gen func() (net.Listener, string, error)
l net.Listener
laddr string
@@ -58,10 +63,17 @@ func (s *listenerStreamServer) String() string {
return fmt.Sprintf("%T(%s)", s, s.laddr)
}
+func (s *listenerStreamServer) Address() string {
+ if s.address == "" {
+ panic("server must be listening to get its address")
+ }
+ return s.address
+}
+
func (s *listenerStreamServer) Listen() error {
// Create a listener (OS-specific).
var err error
- s.l, err = s.gen()
+ s.l, s.address, err = s.gen()
if err != nil {
return err
}
« no previous file with comments | « logdog/client/butler/butler_test.go ('k') | logdog/client/butler/streamserver/base_test.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698