commit fa230ebb8a103e568e33bb096ce219314bda06ce
author Matt Rosencrantz <mattr@google.com> Wed Sep 16 01:18:05 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 16 01:18:05 2015 +0000
tree a75aad562a15c404d335c809720d9b29df4f649a
parent 4ef9e250f8aa56909af520a6898fefd97d73d75c
parent 8fd0f48b4683e4507a26409b92967431b209f678

Merge "ref: Update and enhance several comments related to the new server API."

runtime/internal/rpc/server.go

diff --git a/runtime/internal/rpc/server.go b/runtime/internal/rpc/server.go
index f93c7f4..6682bcb 100644
--- a/runtime/internal/rpc/server.go
+++ b/runtime/internal/rpc/server.go
@@ -151,7 +151,7 @@
 	}
 
 	externalStates = map[serverState]rpc.ServerState{
-		initialized: rpc.ServerInit,
+		initialized: rpc.ServerActive,
 		listening:   rpc.ServerActive,
 		serving:     rpc.ServerActive,
 		publishing:  rpc.ServerActive,

runtime/internal/rpc/server_test.go

diff --git a/runtime/internal/rpc/server_test.go b/runtime/internal/rpc/server_test.go
index 7263415..3e8c3fc 100644
--- a/runtime/internal/rpc/server_test.go
+++ b/runtime/internal/rpc/server_test.go
@@ -154,7 +154,7 @@
 	defer server.Stop()
 
 	status := server.Status()
-	if got, want := status.State, rpc.ServerInit; got != want {
+	if got, want := status.State, rpc.ServerActive; got != want {
 		t.Fatalf("got %s, want %s", got, want)
 	}
 	server.Listen(rpc.ListenSpec{Addrs: rpc.ListenAddrs{{"tcp", "127.0.0.1:0"}}})
@@ -260,7 +260,7 @@
 		}
 	}
 
-	expectState(rpc.ServerInit)
+	expectState(rpc.ServerActive)
 
 	// Need to call Listen first.
 	err = server.Serve("", &testServer{}, nil)