Adds master command to doorman_shell

Author: josvisser

go/client/doorman/client.go

@@ -105,7 +105,6 @@ type Option connection.Option
 
 // getClientID returns a unique client id, consisting of a host:pid id plus a counter
 func getClientID() string {
-
 	hostname, err := os.Hostname()
 
 	if err != nil {
@@ -201,6 +200,15 @@ func NewWithID(addr string, id string, opts ...Option) (*Client, error) {
 	return client, nil
 }
 
+// GetMaster returns the address of the Doorman master we are connected to.
+func (client *Client) GetMaster() string {
+  if client.conn == nil {
+    return ""
+  }
+
+  return client.conn.String()
+}
+
 // run is the client's main loop. It takes care of requesting new
 // resources, and managing ones already claimed. This is the only
 // method that should be modifying the client's internal state and

go/cmd/doorman_shell/doorman_shell.go

@@ -74,6 +74,10 @@ show
   the asynchronous nature of the Doorman API you may not see the
   requested assignments immediately.
 
+master
+
+  Shows the current Doorman master for each client.
+
 help
   
   Show this information.
@@ -223,7 +227,11 @@ func (client *Multiclient) Eval(command []string) error {
 		}
 		clientID, resourceID := tail[0], tail[1]
 		return client.Release(clientID, resourceID)
-
+  case "master":
+    for k, v := range client.clients {
+      fmt.Printf("%s: %s\n", k, v.GetMaster())
+    }
+    return nil
 	case "help":
 		fmt.Fprintln(os.Stderr, help)
 		return nil
@@ -232,7 +240,6 @@ func (client *Multiclient) Eval(command []string) error {
 	default:
 		return errors.New("unrecognized command")
 	}
-
 }
 
 func (client *Multiclient) Close() {