Add Task.String()

state/state.go

@@ -4,6 +4,7 @@ package state
 // NOTE: Avoid dependencies on any other m-lab code.
 import (
 	"errors"
+	"fmt"
 )
 
 // State indicates the state of a single Task in flight.
@@ -21,6 +22,17 @@ const (
 	Done                // Done all processing, ok to delete state.
 )
 
+// StateNames maps from State to string, for use in String()
+var StateNames map[State]string = map[State]string{
+	Initializing:  "Initializing",
+	Queuing:       "Queuing",
+	Processing:    "Processing",
+	Stabilizing:   "Stabilizing",
+	Deduplicating: "Deduplicating",
+	Finishing:     "Finishing",
+	Done:          "Done",
+}
+
 // Saver provides API for saving Task state.
 type Saver interface {
 	SaveTask(t Task) error
@@ -52,6 +64,10 @@ type Task struct {
 	saver Saver // Saver is used for Save operations. Stored locally, but not persisted.
 }
 
+func (t Task) String() string {
+	return fmt.Sprintf("{%s: %s, Q:%s, J:%s, E:%v (%s)}", t.Name, StateNames[t.State], t.Queue, t.JobID, t.Err, t.ErrInfo)
+}
+
 // ErrNoSaver is returned when saver has not been set.
 var ErrNoSaver = errors.New("Task.saver is nil")
 

state/state_test.go

@@ -8,6 +8,11 @@ import (
 	"github.com/m-lab/etl-gardener/state"
 )
 
+func init() {
+	// Always prepend the filename and line number.
+	log.SetFlags(log.LstdFlags | log.Lshortfile)
+}
+
 type testSaver struct {
 	tasks  map[string][]state.Task
 	delete map[string]struct{}
@@ -19,7 +24,6 @@ func (s *testSaver) SaveTask(t state.Task) error {
 }
 
 func (s *testSaver) DeleteTask(t state.Task) error {
-	log.Println(t.Name)
 	s.delete[t.Name] = struct{}{}
 	return nil
 }
@@ -70,5 +74,4 @@ func TestTaskBasics(t *testing.T) {
 	if !ok {
 		t.Fatal("Should have called delete")
 	}
-
 }