veyron/runtimes/google/ipc: add options to ipc server constructor to control
which endpoints to mount when publishing, and to allow for endpoint rewrite.
Details:
- the new ServerPublishOpt option is a server opt and offers the choices of
mounting all listened endpoints (the default), or mounting the first endpoint
only.
- the new EndpointRewriteOpt is a listener opt that tells the listener whether to
massage the endpoint it returns to replace a tcp ip with a desired host or
ip (this is needed for e.g. GCE where the public ip that we want to put in
the mounttable differs from the ip that the process sees when listening).
Change-Id: I0c870399a27a9201277882abcb6a2e860a065f4c
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index ca493b4..bcac1e3 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -11,6 +11,7 @@
isecurity "veyron/runtimes/google/security"
"veyron/runtimes/google/security/wire"
+ "veyron2"
"veyron2/ipc"
"veyron2/ipc/stream"
"veyron2/naming"
@@ -40,6 +41,7 @@
active sync.WaitGroup // active goroutines we've spawned.
stopped bool // whether the server has been stopped.
mt naming.MountTable
+ publishOpt veyron2.ServerPublishOpt // which endpoints to publish
}
func InternalNewServer(streamMgr stream.Manager, mt naming.MountTable, opts ...ipc.ServerOpt) (ipc.Server, error) {
@@ -49,10 +51,13 @@
publisher: InternalNewPublisher(mt, publishPeriod),
mt: mt,
}
- // Collect all ServerOpts that are also ListenerOpts.
for _, opt := range opts {
- if lopt, ok := opt.(stream.ListenerOpt); ok {
- s.listenerOpts = append(s.listenerOpts, lopt)
+ switch opt := opt.(type) {
+ case stream.ListenerOpt:
+ // Collect all ServerOpts that are also ListenerOpts.
+ s.listenerOpts = append(s.listenerOpts, opt)
+ case veyron2.ServerPublishOpt:
+ s.publishOpt = opt
}
}
return s, nil
@@ -147,8 +152,14 @@
}(flow)
}
}(ln, ep)
+ var publishEP string
+ if s.publishOpt == veyron2.PublishAll || len(s.listeners) == 1 {
+ publishEP = naming.JoinAddressName(ep.String(), "")
+ }
s.Unlock()
- s.publisher.AddServer("/" + ep.String())
+ if len(publishEP) > 0 {
+ s.publisher.AddServer(publishEP)
+ }
return ep, nil
}
