From 3070d156a36bb30abd80ed5f8e0a218ca0c63a83 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <me@cschwarz.com>
Date: Fri, 1 Sep 2017 14:10:12 +0200
Subject: [PATCH] jobrun: rename to jobmetadata

---
 cmd/autosnap.go    |  2 +-
 cmd/replication.go |  6 +++---
 jobrun/jobrun.go   | 30 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cmd/autosnap.go b/cmd/autosnap.go
index 74fa70f..e89c9c4 100644
--- a/cmd/autosnap.go
+++ b/cmd/autosnap.go
@@ -40,7 +40,7 @@ func cmdAutosnap(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	job := jobrun.Job{
+	job := jobrun.JobMetadata{
 		Name:           snap.JobName,
 		RepeatStrategy: snap.Interval,
 		RunFunc: func(log jobrun.Logger) error {
diff --git a/cmd/replication.go b/cmd/replication.go
index cce0996..aa2184f 100644
--- a/cmd/replication.go
+++ b/cmd/replication.go
@@ -92,10 +92,10 @@ func cmdRun(cmd *cobra.Command, args []string) {
 		runner.Start()
 	}()
 
-	jobs := make([]jobrun.Job, len(conf.Pulls)+len(conf.Pushs))
+	jobs := make([]jobrun.JobMetadata, len(conf.Pulls)+len(conf.Pushs))
 	i := 0
 	for _, pull := range conf.Pulls {
-		jobs[i] = jobrun.Job{
+		jobs[i] = jobrun.JobMetadata{
 			Name:           fmt.Sprintf("pull.%d", i),
 			RepeatStrategy: pull.RepeatStrategy,
 			RunFunc: func(log jobrun.Logger) error {
@@ -106,7 +106,7 @@ func cmdRun(cmd *cobra.Command, args []string) {
 		i++
 	}
 	for _, push := range conf.Pushs {
-		jobs[i] = jobrun.Job{
+		jobs[i] = jobrun.JobMetadata{
 			Name:           fmt.Sprintf("push.%d", i),
 			RepeatStrategy: push.RepeatStrategy,
 			RunFunc: func(log jobrun.Logger) error {
diff --git a/jobrun/jobrun.go b/jobrun/jobrun.go
index 2207ad7..eb6b73d 100644
--- a/jobrun/jobrun.go
+++ b/jobrun/jobrun.go
@@ -18,7 +18,7 @@ func (l jobLogger) Printf(format string, v ...interface{}) {
 	l.MainLog.Printf(fmt.Sprintf("job[%s]: %s", l.JobName, format), v...)
 }
 
-type Job struct {
+type JobMetadata struct {
 	Name           string
 	RunFunc        func(log Logger) (err error)
 	LastStart      time.Time
@@ -41,34 +41,34 @@ type RepeatStrategy interface {
 
 type JobRunner struct {
 	logger           Logger
-	notificationChan chan Job
-	newJobChan       chan Job
-	finishedJobChan  chan Job
+	notificationChan chan JobMetadata
+	newJobChan       chan JobMetadata
+	finishedJobChan  chan JobMetadata
 	scheduleTimer    <-chan time.Time
-	pending          map[string]Job
-	running          map[string]Job
+	pending          map[string]JobMetadata
+	running          map[string]JobMetadata
 }
 
 func NewJobRunner(logger Logger) *JobRunner {
 	return &JobRunner{
 		logger:           logger,
-		notificationChan: make(chan Job),
-		newJobChan:       make(chan Job),
-		finishedJobChan:  make(chan Job),
-		pending:          make(map[string]Job),
-		running:          make(map[string]Job),
+		notificationChan: make(chan JobMetadata),
+		newJobChan:       make(chan JobMetadata),
+		finishedJobChan:  make(chan JobMetadata),
+		pending:          make(map[string]JobMetadata),
+		running:          make(map[string]JobMetadata),
 	}
 }
 
-func (r *JobRunner) AddJobChan() chan<- Job {
+func (r *JobRunner) AddJobChan() chan<- JobMetadata {
 	return r.newJobChan
 }
 
-func (r *JobRunner) AddJob(j Job) {
+func (r *JobRunner) AddJob(j JobMetadata) {
 	r.newJobChan <- j
 }
 
-func (r *JobRunner) NotificationChan() <-chan Job {
+func (r *JobRunner) NotificationChan() <-chan JobMetadata {
 	return r.notificationChan
 }
 
@@ -138,7 +138,7 @@ loop:
 		r.running[jobName] = job
 		job.LastStart = now
 
-		go func(job Job) {
+		go func(job JobMetadata) {
 			jobLog := jobLogger{r.logger, job.Name}
 			if err := job.RunFunc(jobLog); err != nil {
 				job.LastError = err