Allow connecting to multiple gearmand servers and combining the resul…

…ting status lines

.gitignore

@@ -1 +1,2 @@
 .externalToolBuilders
+/.DS_Store

README.md

@@ -14,12 +14,10 @@ Usage of gearman_gtop:
   -all=false: Show all queues, even if the have no workers or jobs
   -filterExclude="": Exclude queues containing this string. Can provide multiple separated by commas.
   -filterInclude="": Include queues containing this string. Can provide multiple separated by commas.
-  -h="localhost": Gearmand host to connect to (shorthand)
-  -host="localhost": Gearmand host to connect to
+  -h="localhost:4730": Gearmand host to connect to. Specify multiple separated by ';' (shorthand)
+  -host="localhost:4730": Gearmand host to connect to. Specify multiple separated by ';'
   -l=false: Log debug to /tmp/gearman_gtop.log (shorthand)
   -log=false: Log debug to /tmp/gearman_gtop.log
-  -p="4730": Gearmand port to connect to (shorthand)
-  -port="4730": Gearmand port to connect to
   -sort="1": Index of the column to sort by
 ```
 ### Runtime

gearman_gtop.go

@@ -80,14 +80,10 @@ func init() {
 	allUsage := "Show all queues, even if the have no workers or jobs"
 	flag.BoolVar(&showAll, "all", allDefault, allUsage)
 	flag.BoolVar(&showAll, "a", allDefault, allUsage+" (shorthand)")
-	hostDefault := "localhost"
-	hostUsage := "Gearmand host to connect to"
+	hostDefault := "localhost:4730"
+	hostUsage := "Gearmand host to connect to. Specify multiple separated by ';'"
 	flag.StringVar(&gearmanHost, "host", hostDefault, hostUsage)
 	flag.StringVar(&gearmanHost, "h", hostDefault, hostUsage+" (shorthand)")
-	portDefault := "4730"
-	portUsage := "Gearmand port to connect to"
-	flag.StringVar(&gearmanPort, "port", portDefault, portUsage)
-	flag.StringVar(&gearmanPort, "p", portDefault, portUsage+" (shorthand)")
 	flag.StringVar(&initialSortIndex, "sort", "1", "Index of the column to sort by")
 	flag.StringVar(&queueNameInclude, "filterInclude", "", "Include queues containing this string. Can provide multiple separated by commas.")
 	flag.StringVar(&queueNameExclude, "filterExclude", "", "Exclude queues containing this string. Can provide multiple separated by commas.")
@@ -151,16 +147,35 @@ func handleEvents() {
 
 func (d *display) updateLines() {
 	log.Println("Connecting to gearman")
-	gearadminClient := gearadmin.New(gearmanHost, gearmanPort)
-	defer gearadminClient.Close()
+	connectionDetails := strings.Split(gearmanHost, ";")
+	var clients []gearadmin.Client
+	for _, connectionDetail := range connectionDetails {
+		splitConnectionDetail := strings.Split(connectionDetail, ":")
+		if len(splitConnectionDetail) > 2 {
+			fatal("Invalid connection string: " + connectionDetail)
+			return
+		}
+		host := splitConnectionDetail[0]
+		port := "4730"
+		if len(splitConnectionDetail) == 2 {
+			port = splitConnectionDetail[1]
+		}
+		gearadminClient := gearadmin.New(host, port)
+		defer gearadminClient.Close()
+		clients = append(clients, gearadminClient)
+	}
 	responseFilter := statusFilter(initialiseFilters())
 	for {
 		log.Println("Getting status")
 		start := time.Now()
-		statusLines, err := gearadminClient.StatusFiltered(responseFilter)
-		if err != nil {
-			fatal("Couldn't get gearman status from " + gearmanHost + ":" + gearmanPort + " (Error: " + err.Error() + ")")
-			return
+		statusLines := gearadmin.StatusLines{}
+		for _, client := range clients {
+			newStatusLines, err := client.StatusFiltered(responseFilter)
+			if err != nil {
+				fatal("Couldn't get gearman status from " + client.ConnectionString() + " (Error: " + err.Error() + ")")
+				return
+			}
+			statusLines = statusLines.Merge(newStatusLines)
 		}
 		d.statusLines = statusLines
 		d.sortLines()