Merge "veyron/services/mounttable/mounttable: Add test.sh and fix a couple of bugs."
diff --git a/services/mgmt/binary/binaryd/main.go b/services/mgmt/binary/binaryd/main.go
index 49a6b05..55b4d6a 100644
--- a/services/mgmt/binary/binaryd/main.go
+++ b/services/mgmt/binary/binaryd/main.go
@@ -74,18 +74,13 @@
vlog.Errorf("NewDispatcher(%v, %v, %v) failed: %v", root, defaultDepth, auth, err)
return
}
- suffix := ""
- if err := server.Register(suffix, dispatcher); err != nil {
- vlog.Errorf("Register(%v, %v) failed: %v", suffix, dispatcher, err)
- return
- }
endpoint, err := server.Listen(protocol, address)
if err != nil {
vlog.Errorf("Listen(%v, %v) failed: %v", protocol, address, err)
return
}
- if err := server.Publish(name); err != nil {
- vlog.Errorf("Publish(%v) failed: %v", name, err)
+ if err := server.Serve(name, dispatcher); err != nil {
+ vlog.Errorf("Server(%v) failed: %v", name, err)
return
}
vlog.Infof("Binary repository published at %v/%v", endpoint, name)
diff --git a/services/mgmt/binary/impl/impl_test.go b/services/mgmt/binary/impl/impl_test.go
index 08c69af..beaeb35 100644
--- a/services/mgmt/binary/impl/impl_test.go
+++ b/services/mgmt/binary/impl/impl_test.go
@@ -105,19 +105,19 @@
if err != nil {
t.Fatalf("NewDispatcher(%v, %v, %v) failed: %v", root, depth, nil, err)
}
- suffix := ""
- if err := server.Register(suffix, dispatcher); err != nil {
- t.Fatalf("Register(%v, %v) failed: %v", suffix, dispatcher, err)
- }
protocol, hostname := "tcp", "localhost:0"
endpoint, err := server.Listen(protocol, hostname)
if err != nil {
t.Fatalf("Listen(%v, %v) failed: %v", protocol, hostname, err)
}
- name := naming.JoinAddressName(endpoint.String(), "//test")
+ suffix := "test"
+ if err := server.Serve(suffix, dispatcher); err != nil {
+ t.Fatalf("Serve(%v) failed: %v", suffix, err)
+ }
+ name := naming.JoinAddressName(endpoint.String(), suffix)
binary, err := repository.BindBinary(name)
if err != nil {
- t.Fatalf("BindRepository() failed: %v", err)
+ t.Fatalf("BindBinary(%v) failed: %v", name, err)
}
return binary, func() {
// Shutdown the binary repository server.
diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index 361f399..1e62541 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -285,7 +285,7 @@
if err != nil {
vlog.Fatalf("NewServer() failed: %v", err)
}
- dispatcher := ipc.SoloDispatcher(repository.NewServerContent(&crInvoker{}), nil)
+ dispatcher := ipc.SoloDispatcher(repository.NewServerBinary(&crInvoker{}), nil)
protocol, hostname := "tcp", "localhost:0"
endpoint, err := server.Listen(protocol, hostname)
if err != nil {
diff --git a/services/proximity/proximityd/main.go b/services/proximity/proximityd/main.go
index b35599e..fdb3201 100644
--- a/services/proximity/proximityd/main.go
+++ b/services/proximity/proximityd/main.go
@@ -59,11 +59,6 @@
}
defer p.Stop()
- // Register the service with the server.
- if err := s.Register("", ipc.SoloDispatcher(prox.NewServerProximity(p), vflag.NewAuthorizerOrDie())); err != nil {
- vlog.Fatal("error registering service:", err)
- }
-
// Create an endpoint to listen on.
endpoint, err := s.Listen(*protocol, *address)
if err != nil {
@@ -73,7 +68,7 @@
// Start the server and register it with the mounttable under the
// given name.
- if err := s.Publish(*name); err != nil {
+ if err := s.Serve(*name, ipc.SoloDispatcher(prox.NewServerProximity(p), vflag.NewAuthorizerOrDie())); err != nil {
vlog.Fatalf("error publishing service (%s): %v", *name, err)
}
