add child phases to info endpoint (#139)

* add child phases to info endpoint

* update dockerfile

Dockerfile

@@ -1,10 +1,21 @@
 
-FROM alpine:3.10.2
-ADD https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64 /usr/bin/confd
+FROM alpine:3.12
 
-RUN chmod +x /usr/bin/confd
 RUN apk add ca-certificates
 RUN apk add curl
-RUN apk add jq
+
+#confd
+ADD https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64 /usr/bin/confd
+RUN chmod +x /usr/bin/confd
+
+#gojq
+ADD https://github.com/itchyny/gojq/releases/download/v0.12.0/gojq_v0.12.0_linux_amd64.tar.gz /tmp/jq.tar.gz
+RUN cd /tmp && tar -xzf jq.tar.gz
+RUN cp /tmp/gojq_v0.12.0_linux_amd64/gojq /usr/bin/jq
+RUN rm -rf /tmp/*
+
+#ll
+RUN echo -e "#!/bin/sh \n ls -Alhp \$1" > /usr/bin/ll
+RUN chmod +x /usr/bin/ll
 
 COPY build/ /usr/bin/

apps/taskmasters/flowlord/taskmaster.go

@@ -43,13 +43,14 @@ type stats struct {
 	RunTime    string            `json:"runtime"`
 	NextUpdate string            `json:"next_cache_update"`
 	Workflow   map[string]int    `json:"workflow"`
-	Entries    map[string]cEntry `json:"job"`
+	Entries    map[string]cEntry `json:"cron"`
 }
 
 type cEntry struct {
 	Next     time.Time
 	Prev     time.Time
 	Schedule string
+	Child    []string `json:"Child,omitempty"`
 }
 
 func New(app *bootstrap.TaskMaster) bootstrap.Runner {
@@ -94,8 +95,11 @@ func (tm *taskMaster) Info() interface{} {
 			Next:     e.Next,
 			Prev:     e.Prev,
 			Schedule: j.Schedule,
+			Child:    make([]string, 0),
 		}
-		sts.Entries[j.Name] = ent
+		k := j.Topic + ":" + j.Name
+		ent.Child = tm.getAllChildren(j.Topic, j.Workflow, j.Name)
+		sts.Entries[k] = ent
 	}
 	if tm.Cache != nil {
 		for k, v := range tm.Workflows {
@@ -105,6 +109,17 @@ func (tm *taskMaster) Info() interface{} {
 	return sts
 }
 
+func (tm *taskMaster) getAllChildren(topic, workflow, job string) (s []string) {
+	for _, c := range tm.Children(task.Task{Type: topic, Meta: "workflow=" + workflow + "&job=" + job}) {
+		job := c.Task + ":" + c.Job()
+		if children := tm.getAllChildren(c.Task, workflow, c.Job()); len(children) > 0 {
+			job += " ➞ " + strings.Join(children, " ➞ ")
+		}
+		s = append(s, job)
+	}
+	return s
+}
+
 // AutoUpdate will create a go routine to auto update the cached files
 // if any changes have been made to the workflow files
 func (tm *taskMaster) AutoUpdate() {
@@ -185,7 +200,6 @@ func (tm *taskMaster) schedule() (err error) {
 			if _, err = tm.cron.AddJob(j.Schedule, j); err != nil {
 				return errors.Wrapf(err, "invalid rule for %s:%s %s", path, w.Task, w.Rule)
 			}
-			log.Printf("cron: task:%s, rule:%s, info:%s\t %v \n", w.Task, j.Schedule, w.Template, rules)
 		}
 	}
 	tm.cron.Start()

workflow/workflow.go

@@ -33,7 +33,12 @@ func (p Phase) Job() string {
 	if len(s) > 1 {
 		return s[1]
 	}
-	return s[0]
+
+	r, _ := url.ParseQuery(p.Rule)
+	if j := r.Get("job"); j != "" {
+		return j
+	}
+	return ""
 }
 
 // Topic portion of the Task