restore to working with redis.v5

src/brooce/heartbeat/heartbeat.go

@@ -98,7 +98,7 @@ func auditHeartbeats() {
 	keyMatch := fmt.Sprintf("%s:workerprocs:%v-*", config.Config.ClusterName, myip.PublicIPv4())
 	var keys []string
 	keys, err = redisClient.Keys(keyMatch).Result()
-	if err != nil {
+	if err != nil || len(keys) == 0 {
 		return
 	}
 

src/brooce/listing/crons.go

@@ -26,7 +26,7 @@ func crons(disabled bool) (crons map[string]*cron.CronType, err error) {
 	}
 
 	keys, err = redisClient.Keys(cronKeyPrefix + "*").Result()
-	if err != nil {
+	if err != nil || len(keys) == 0 {
 		return
 	}
 

src/brooce/listing/runningjobs.go

@@ -17,7 +17,7 @@ func RunningJobs() (jobs []*task.Task, err error) {
 
 	var keys []string
 	keys, err = redisClient.Keys(redisHeader + ":queue:*:working:*").Result()
-	if err != nil {
+	if err != nil || len(keys) == 0 {
 		return
 	}
 

src/brooce/listing/runningworkers.go

@@ -11,7 +11,7 @@ import (
 func RunningWorkers() (workers []*heartbeat.HeartbeatType, err error) {
 	var keys []string
 	keys, err = redisClient.Keys(redisHeader + ":workerprocs:*").Result()
-	if err != nil {
+	if err != nil || len(keys) == 0 {
 		return
 	}
 

src/brooce/web/joblist.go

@@ -89,6 +89,11 @@ func (output *joblistOutputType) listJobs(reverse bool) (err error) {
 
 	rangeLength := len(rangeResult.Val())
 	output.Jobs = make([]*task.Task, rangeLength)
+
+	if len(output.Jobs) == 0 {
+		return
+	}
+
 	for i, value := range rangeResult.Val() {
 		job, err := task.NewFromJson(value)
 		if err != nil {

src/brooce/web/mainpage.go

@@ -61,7 +61,7 @@ func listQueues(runningWorkers []*heartbeat.HeartbeatType) (list map[string]*lis
 	list = map[string]*listQueueType{}
 	var results []string
 	results, err = redisClient.Keys(redisHeader + ":queue:*").Result()
-	if err != nil {
+	if err != nil || len(results) == 0 {
 		return
 	}