Several improvements and job print format

Author: mcuadros

cli/bury.go

@@ -10,7 +10,7 @@ import (
 
 type BuryCommand struct {
 	Tube string `short:"t" long:"tube" description:"tube to bury jobs in." required:"true"`
-	Num  int    `short:"n" long:"num" description:"number of jobs to bury."`
+	Num  int    `short:"" long:"num" description:"number of jobs to bury."`
 	Command
 }
 

cli/command.go

@@ -1,9 +1,15 @@
 package cli
 
 import (
+	"fmt"
+
+	"github.com/agtorre/gocolorize"
 	"github.com/kr/beanstalk"
 )
 
+var TitleStyle = gocolorize.NewColor("green")
+var InfoStyle = gocolorize.NewColor("yellow")
+
 type Command struct {
 	Host string `short:"h" long:"host" description:"beanstalkd host addr." required:"true" default:"localhost:11300"`
 
@@ -20,6 +26,35 @@ func (c *Command) Init() error {
 	return nil
 }
 
+func (c *Command) PrintJob(id uint64, body []byte) error {
+	s, err := c.conn.StatsJob(id)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf(
+		"%s: %d, %s: %d, %s: %s, %s: %s, %s: %s, %s: %s\n"+
+			"%s: %s, %s: %s, %s: %s, %s: %s, %s: %s\n"+
+			"%s:\n%q\n",
+		TitleStyle.Paint("id"), id,
+		TitleStyle.Paint("length"), len(body),
+		TitleStyle.Paint("priority"), s["pri"],
+		TitleStyle.Paint("delay"), s["delay"],
+		TitleStyle.Paint("age"), s["age"],
+		TitleStyle.Paint("ttr"), s["ttr"],
+
+		InfoStyle.Paint("reserves"), s["reserves"],
+		InfoStyle.Paint("releases"), s["releases"],
+		InfoStyle.Paint("buries"), s["buries"],
+		InfoStyle.Paint("kicks"), s["kicks"],
+		InfoStyle.Paint("timeouts"), s["timeouts"],
+
+		InfoStyle.Paint("body"), body,
+	)
+
+	return nil
+}
+
 func (c *Command) GetStatsForTube(tube string) (*TubeStats, error) {
 	t := &beanstalk.Tube{c.conn, tube}
 	s, err := t.Stats()

cli/kick.go

@@ -8,7 +8,7 @@ import (
 
 type KickCommand struct {
 	Tube string `short:"t" long:"tube" description:"tube to kick jobs in." required:"true"`
-	Num  int    `short:"n" long:"num" description:"number of jobs to kick."`
+	Num  int    `short:"" long:"num" description:"number of jobs to kick."`
 	Command
 }
 

cli/peek.go

@@ -1,14 +1,12 @@
 package cli
 
 import (
-	"fmt"
-
 	"github.com/kr/beanstalk"
 )
 
 type PeekCommand struct {
 	Tube  string `short:"t" long:"tube" description:"tube to be tailed." required:"true"`
-	State string `short:"s" long:"state" description:"peek from 'buried', 'ready' or 'delayed' queues." required:"true" default:"buried"`
+	State string `short:"" long:"state" description:"peek from 'buried', 'ready' or 'delayed' queues." default:"buried"`
 	Command
 }
 
@@ -29,15 +27,21 @@ func (c *PeekCommand) Peek() error {
 	var id uint64
 	var body []byte
 	var err error
-	id, body, err = t.PeekBuried()
+
+	switch c.State {
+	case "buried":
+		id, body, err = t.PeekBuried()
+	case "ready":
+		id, body, err = t.PeekReady()
+	case "delayed":
+		id, body, err = t.PeekDelayed()
+	}
+
 	if err != nil {
 		return err
 	}
 
-	fmt.Printf(
-		"id: %d\nlen: %d\nbody: %q\n\n",
-		id, len(body), body,
-	)
+	c.PrintJob(id, body)
 
 	return nil
 }

cli/put.go

@@ -38,8 +38,8 @@ func (c *PutCommand) Put() error {
 	}
 
 	fmt.Printf(
-		"Added job with id %d to %s with priority %d, delay %d, TTR %d\n",
-		id, c.Tube, c.Priority, c.Delay, c.TTR,
+		"Added job with id %d to %s with priority %d, delay %s, TTR %d\n",
+		id, c.Tube, c.Priority, c.Delay.String(), c.TTR,
 	)
 
 	return nil

cli/stats.go

@@ -65,13 +65,13 @@ func (c *StatsCommand) buildLineFromTubeStats(name string, s *TubeStats) []strin
 	l := make([]string, 0)
 
 	l = append(l, name)
-	l = append(l, addStyle(s.JobsBuried, 10, HighSeverity))
-	l = append(l, addStyle(s.JobsDelayed, 10, NormalSeverity))
-	l = append(l, addStyle(s.JobsReady, 10, NormalSeverity))
-	l = append(l, addStyle(s.JobsReserved, 10, NormalSeverity))
-	l = append(l, addStyle(s.JobsUrgent, 10, NormalSeverity))
-	l = append(l, addStyle(s.Waiting, 10, LowSeverity))
-	l = append(l, addStyle(s.TotalJobs, 10, LowSeverity))
+	l = append(l, addStyle(s.JobsBuried, 8, HighSeverity))
+	l = append(l, addStyle(s.JobsDelayed, 8, NormalSeverity))
+	l = append(l, addStyle(s.JobsReady, 8, NormalSeverity))
+	l = append(l, addStyle(s.JobsReserved, 8, NormalSeverity))
+	l = append(l, addStyle(s.JobsUrgent, 8, NormalSeverity))
+	l = append(l, addStyle(s.Waiting, 8, LowSeverity))
+	l = append(l, addStyle(s.TotalJobs, 8, LowSeverity))
 
 	return l
 }

cli/tail.go

@@ -1,14 +1,20 @@
 package cli
 
 import (
+	"errors"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/kr/beanstalk"
 )
 
+var TooManyErrorsError = errors.New("Too many errors")
+
 type TailCommand struct {
-	Tube string `short:"t" long:"tube" description:"tube to be tailed." required:"true"`
+	Tube   string `short:"t" long:"tube" description:"tube to be tailed." required:"true"`
+	Action string `short:"" long:"action" description:"action to perform after reserver the job. (release, bury, delete)" default:"release"`
+
 	Command
 }
 
@@ -27,18 +33,53 @@ func (c *TailCommand) Execute(args []string) error {
 func (c *TailCommand) Tail() error {
 	ts := beanstalk.NewTubeSet(c.conn, c.Tube)
 
+	errors := 0
 	for {
+		if errors > 100 {
+			return TooManyErrorsError
+		}
+
 		id, body, err := ts.Reserve(time.Hour * 24)
 		if err != nil {
+			if err.Error() != "reserve-with-timeout: deadline soon" {
+				errors++
+				fmt.Println("Error", err)
+			}
+
+			continue
+		}
+
+		if err := c.PrintJob(id, body); err != nil {
+			errors++
+			fmt.Println("Error", err)
+			continue
+		}
+
+		if err := c.postPrintAction(id); err != nil {
 			return err
 		}
 
-		s, _ := c.conn.StatsJob(id)
+		fmt.Println(strings.Repeat("-", 80))
+	}
+
+	return nil
+}
+
+func (c *TailCommand) postPrintAction(id uint64) error {
+	var err error
 
-		fmt.Printf(
-			"id: %d\nlen: %d\npriority: %s\nbody: %q\n\n",
-			id, len(body), s["pri"], body,
-		)
+	switch c.Action {
+	case "release":
+		err = c.conn.Release(id, 1024, 0)
+	case "bury":
+		err = c.conn.Bury(id, 1024)
+	case "delete":
+		err = c.conn.Delete(id)
 	}
 
+	if err != nil {
+		return err
+	}
+
+	return nil
 }