apps: Change runtime.AppCycle to veyron2.GetAppCycle(ctx)
Change-Id: Ib2811a0e34459d9f0efc3efb03b9eec59ff1fb7c
MultiPart: 4/4
diff --git a/rps/rpsbot/main.go b/rps/rpsbot/main.go
index adc587f..bb83130 100644
--- a/rps/rpsbot/main.go
+++ b/rps/rpsbot/main.go
@@ -36,6 +36,8 @@
}
defer r.Cleanup()
+ ctx := r.NewContext()
+
auth := sflag.NewAuthorizerOrDie()
server, err := r.NewServer()
if err != nil {
@@ -68,9 +70,8 @@
}
vlog.Infof("Listening on endpoint /%s (published as %v)", ep, names)
- ctx := r.NewContext()
go initiateGames(ctx, rpsService)
- <-signals.ShutdownOnSignals(r)
+ <-signals.ShutdownOnSignals(ctx)
}
func initiateGames(ctx *context.T, rpsService *RPS) {
diff --git a/tunnel/tunneld/main.go b/tunnel/tunneld/main.go
index 540f6d7..dca2822 100644
--- a/tunnel/tunneld/main.go
+++ b/tunnel/tunneld/main.go
@@ -45,6 +45,8 @@
}
defer r.Cleanup()
+ ctx := r.NewContext()
+
auth := sflag.NewAuthorizerOrDie()
server, err := r.NewServer()
if err != nil {
@@ -81,5 +83,6 @@
vlog.Fatalf("Failed to publish with any of %v", names)
}
vlog.Infof("Published as %v", names)
- <-signals.ShutdownOnSignals(r)
+
+ <-signals.ShutdownOnSignals(ctx)
}
diff --git a/tunnel/vsh/main.go b/tunnel/vsh/main.go
index a5c0d23..1d854cb 100644
--- a/tunnel/vsh/main.go
+++ b/tunnel/vsh/main.go
@@ -79,6 +79,8 @@
}
defer r.Cleanup()
+ ctx := r.NewContext()
+
oname, cmd, err := objectNameAndCommandLine()
if err != nil {
flag.Usage()
@@ -87,14 +89,13 @@
}
t := tunnel.TunnelClient(oname)
- ctx := r.NewContext()
if len(*portforward) > 0 {
go runPortForwarding(ctx, t, oname)
}
if *noshell {
- <-signals.ShutdownOnSignals(r)
+ <-signals.ShutdownOnSignals(ctx)
return 0
}
