Merge "veyron/lib/modules: Clean up stderr files on Shutdown"
diff --git a/lib/modules/core/wspr.go b/lib/modules/core/wspr.go
index 18bdf7c..0451e1e 100644
--- a/lib/modules/core/wspr.go
+++ b/lib/modules/core/wspr.go
@@ -9,6 +9,8 @@
"veyron.io/veyron/veyron/lib/flags"
"veyron.io/veyron/veyron/lib/modules"
"veyron.io/wspr/veyron/services/wsprd/wspr"
+
+ "veyron.io/veyron/veyron2/rt"
)
var (
@@ -47,8 +49,13 @@
}
args = fl.Args()
+ r, err := rt.New()
+ if err != nil {
+ return fmt.Errorf("rt.New failed: %s", err)
+ }
+ defer r.Cleanup()
l := initListenSpec(fl)
- proxy := wspr.NewWSPR(*port, nil, &l, *identd, nil)
+ proxy := wspr.NewWSPR(r, *port, nil, &l, *identd, nil)
defer proxy.Shutdown()
addr := proxy.Listen()
diff --git a/services/identity/googleoauth/handler.go b/services/identity/googleoauth/handler.go
index fb93bc1..9f40f0e 100644
--- a/services/identity/googleoauth/handler.go
+++ b/services/identity/googleoauth/handler.go
@@ -472,7 +472,7 @@
if err != nil {
return empty, fmt.Errorf("failed to parse duration: %v", err)
}
- return security.ExpiryCaveat(t.Add(time.Minute * offset))
+ return security.ExpiryCaveat(t.Add(offset))
}
func newMethodCaveat(methods []string) (security.Caveat, error) {
