Merge pull request #24 from hibiken/feature/redisinfo

Show basic redis info in stats command

asynq.go

@@ -7,7 +7,6 @@ TODOs:
 - [P0] asynqmon kill <taskID>, asynqmon killall <qname>
 - [P0] Pagination for `asynqmon ls` command
 - [P0] Show elapsed time for InProgress tasks (asynqmon ls inprogress)
-- [P0] Redis Memory Usage, Connection info in stats
 - [P0] Processed, Failed count for today
 - [P0] Go docs + CONTRIBUTION.md + Github issue template + License comment
 - [P0] Redis Sentinel support

internal/rdb/inspect.go

@@ -3,6 +3,7 @@ package rdb
 import (
 	"encoding/json"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/go-redis/redis/v7"
@@ -93,6 +94,23 @@ func (r *RDB) CurrentStats() (*Stats, error) {
 	}, nil
 }
 
+// RedisInfo returns a map of redis info.
+func (r *RDB) RedisInfo() (map[string]string, error) {
+	res, err := r.client.Info().Result()
+	if err != nil {
+		return nil, err
+	}
+	info := make(map[string]string)
+	lines := strings.Split(res, "\r\n")
+	for _, l := range lines {
+		kv := strings.Split(l, ":")
+		if len(kv) == 2 {
+			info[kv[0]] = kv[1]
+		}
+	}
+	return info, nil
+}
+
 // ListEnqueued returns all enqueued tasks that are ready to be processed.
 func (r *RDB) ListEnqueued() ([]*EnqueuedTask, error) {
 	data, err := r.client.LRange(base.DefaultQueue, 0, -1).Result()

internal/rdb/inspect_test.go

@@ -120,7 +120,30 @@ func TestCurrentStats(t *testing.T) {
 			continue
 		}
 	}
+}
 
+func TestRedisInfo(t *testing.T) {
+	r := setup(t)
+
+	info, err := r.RedisInfo()
+	if err != nil {
+		t.Fatalf("RDB.RedisInfo() returned error: %v", err)
+	}
+
+	wantKeys := []string{
+		"redis_version",
+		"uptime_in_days",
+		"connected_clients",
+		"used_memory_human",
+		"used_memory_peak_human",
+		"used_memory_peak_perc",
+	}
+
+	for _, key := range wantKeys {
+		if _, ok := info[key]; !ok {
+			t.Errorf("RDB.RedisInfo() = %v is missing entry for %q", info, key)
+		}
+	}
 }
 
 func TestListEnqueued(t *testing.T) {

tools/asynqmon/cmd/stats.go

@@ -16,6 +16,7 @@ var statsCmd = &cobra.Command{
 	Use:   "stats",
 	Short: "Shows current state of the queues",
 	Long: `Stats (aysnqmon stats) will show the number of tasks in each queue at that instant.
+It also displays basic information about the running redis instance.
 
 To monitor the queues continuously, it's recommended that you run this
 command in conjunction with the watch command.
@@ -51,15 +52,39 @@ func stats(cmd *cobra.Command, args []string) {
 		fmt.Println(err)
 		os.Exit(1)
 	}
+	info, err := r.RedisInfo()
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+	fmt.Println("QUEUES")
 	printStats(stats)
 	fmt.Println()
+	fmt.Println("REDIS INFO")
+	printInfo(info)
+	fmt.Println()
 }
 
 func printStats(s *rdb.Stats) {
 	format := strings.Repeat("%v\t", 5) + "\n"
 	tw := new(tabwriter.Writer).Init(os.Stdout, 0, 8, 2, ' ', 0)
-	fmt.Fprintf(tw, format, "Enqueued", "InProgress", "Scheduled", "Retry", "Dead")
+	fmt.Fprintf(tw, format, "InProgress", "Enqueued", "Scheduled", "Retry", "Dead")
-	fmt.Fprintf(tw, format, "--------", "----------", "---------", "-----", "----")
+	fmt.Fprintf(tw, format, "----------", "--------", "---------", "-----", "----")
-	fmt.Fprintf(tw, format, s.Enqueued, s.InProgress, s.Scheduled, s.Retry, s.Dead)
+	fmt.Fprintf(tw, format, s.InProgress, s.Enqueued, s.Scheduled, s.Retry, s.Dead)
+	tw.Flush()
+}
+
+func printInfo(info map[string]string) {
+	format := strings.Repeat("%v\t", 5) + "\n"
+	tw := new(tabwriter.Writer).Init(os.Stdout, 0, 8, 2, ' ', 0)
+	fmt.Fprintf(tw, format, "Version", "Uptime", "Connections", "Memory Usage", "Peak Memory Usage")
+	fmt.Fprintf(tw, format, "-------", "------", "-----------", "------------", "-----------------")
+	fmt.Fprintf(tw, format,
+		info["redis_version"],
+		fmt.Sprintf("%s days", info["uptime_in_days"]),
+		info["connected_clients"],
+		fmt.Sprintf("%sB", info["used_memory_human"]),
+		fmt.Sprintf("%sB", info["used_memory_peak_human"]),
+	)
 	tw.Flush()
 }