Merge "veyron/services/mounttable: Fixing a bug where a child mounttable (using the -name flag) registering under a root mounttable would re-mount to itself rather than the actual root after TTL expired the first time."
diff --git a/services/mounttable/mounttabled/mounttable.go b/services/mounttable/mounttabled/mounttable.go
index e8a80fe..98df218 100644
--- a/services/mounttable/mounttabled/mounttable.go
+++ b/services/mounttable/mounttabled/mounttable.go
@@ -61,23 +61,23 @@
mtServer, err := r.NewServer(veyron2.ServesMountTableOpt(true))
if err != nil {
vlog.Errorf("r.NewServer failed: %v", err)
- return
+ os.Exit(1)
}
defer mtServer.Stop()
mt, err := mounttable.NewMountTable(*aclFile)
if err != nil {
vlog.Errorf("r.NewMountTable failed: %v", err)
- return
+ os.Exit(1)
}
mtEndpoint, err := mtServer.Listen(*protocol, *address)
if err != nil {
vlog.Errorf("mtServer.Listen failed: %v", err)
- return
+ os.Exit(1)
}
name := *mountName
if err := mtServer.Serve(name, mt); err != nil {
vlog.Errorf("Serve(%v) failed: %v", name, err)
- return
+ os.Exit(1)
}
vlog.Infof("Mount table service at: %q endpoint: %s",
@@ -88,17 +88,17 @@
nhServer, err := r.NewServer(veyron2.ServesMountTableOpt(true))
if err != nil {
vlog.Errorf("r.NewServer failed: %v", err)
- return
+ os.Exit(1)
}
defer nhServer.Stop()
host, _, err := net.SplitHostPort(*address)
if err != nil {
vlog.Errorf("parsing of address(%q) failed: %v", *address, err)
- return
+ os.Exit(1)
}
if _, err = nhServer.Listen(*protocol, net.JoinHostPort(host, "0")); err != nil {
vlog.Errorf("nhServer.Listen failed: %v", err)
- return
+ os.Exit(1)
}
myObjectName := naming.JoinAddressName(mtEndpoint.String(), "")
@@ -106,11 +106,11 @@
nh, err := mounttable.NewNeighborhoodServer(*nhName, myObjectName)
if err != nil {
vlog.Errorf("NewNeighborhoodServer failed: %v", err)
- return
+ os.Exit(1)
}
if err := nhServer.Serve(naming.JoinAddressName(myObjectName, "//nh"), nh); err != nil {
vlog.Errorf("nhServer.Serve failed to register neighborhood: %v", err)
- return
+ os.Exit(1)
}
}
