veyron2: move the AppCycle implementation out of the runtime.
- this change moves AppCycle out of the core veyron2.Runtime
interface, this in turn both reduces the code+dependencies
in the runtime and allows the AppCycle implementation to use
stubs.
- profiles provide an appropriate AppCycle server to the runtime,
which will then create a server if appropriate to allow remote
access
- this unifies 'shutdown/cleanup' for profiles, the runtime
and the AppCycle.
Change-Id: Ie013dfa5d116b3fbe85a3544c01e383223b4b7b5
diff --git a/profiles/static/static.go b/profiles/static/static.go
index 377874a..2720f1d 100644
--- a/profiles/static/static.go
+++ b/profiles/static/static.go
@@ -11,6 +11,7 @@
"veyron.io/veyron/veyron2/ipc"
"veyron.io/veyron/veyron2/rt"
+ "veyron.io/veyron/veyron/lib/appcycle"
"veyron.io/veyron/veyron/lib/flags"
"veyron.io/veyron/veyron/lib/netstate"
"veyron.io/veyron/veyron/profiles"
@@ -34,6 +35,7 @@
type static struct {
gce string
+ ac *appcycle.AppCycle
}
// New returns a new instance of a very static Profile. It can be used
@@ -55,7 +57,7 @@
return p
}
-func (p *static) Init(rt veyron2.Runtime, _ *config.Publisher) error {
+func (p *static) Init(rt veyron2.Runtime, _ *config.Publisher) (veyron2.AppCycle, error) {
log := rt.Logger()
rt.ConfigureReservedName(debug.NewDispatcher(log.LogDir(), sflag.NewAuthorizerOrDie(), rt.VtraceStore()))
@@ -67,6 +69,8 @@
Proxy: lf.ListenProxy,
}
+ p.ac = appcycle.New(rt)
+
// Our address is private, so we test for running on GCE and for its
// 1:1 NAT configuration. GCEPublicAddress returns a non-nil addr
// if we are indeed running on GCE.
@@ -76,11 +80,17 @@
return []ipc.Address{&netstate.AddrIfc{addr, "nat", nil}}, nil
}
p.gce = "+gce"
- return nil
+ return p.ac, nil
}
}
ListenSpec.AddressChooser = internal.IPAddressChooser
- return nil
+ return p.ac, nil
+}
+
+func (p *static) Cleanup() {
+ if p.ac != nil {
+ p.ac.Shutdown()
+ }
}
func (p *static) String() string {
