Merge branch '4520-arv-copy-project-uuid' closes #4520

[arvados.git] / services / datamanager / datamanager.go

diff --git a/services/datamanager/datamanager.go b/services/datamanager/datamanager.go
index bd68db112ad26f4eedfe61c6cf5657d48b33cb24..a8e506eacb1d0f5c533d005a7a3b321b9c6b76d3 100644 (file)
--- a/services/datamanager/datamanager.go
+++ b/services/datamanager/datamanager.go
@@ -15,24 +15,42 @@ import (
 )
 
 var (
-       logEventType        string
+       logEventTypePrefix  string
        logFrequencySeconds int
+       minutesBetweenRuns  int
 )
 
 func init() {
-       flag.StringVar(&logEventType,
-               "log-event-type",
-               "experimental-data-manager-report",
-               "event_type to use in our arvados log entries. Set to empty to turn off logging")
+       flag.StringVar(&logEventTypePrefix,
+               "log-event-type-prefix",
+               "experimental-data-manager",
+               "Prefix to use in the event_type of our arvados log entries. Set to empty to turn off logging")
        flag.IntVar(&logFrequencySeconds,
                "log-frequency-seconds",
                20,
                "How frequently we'll write log entries in seconds.")
+       flag.IntVar(&minutesBetweenRuns,
+               "minutes-between-runs",
+               0,
+               "How many minutes we wait betwen data manager runs. 0 means run once and exit.")
 }
 
 func main() {
        flag.Parse()
+       if minutesBetweenRuns == 0 {
+               singlerun()
+       } else {
+               waitTime := time.Minute * time.Duration(minutesBetweenRuns)
+               for {
+                       log.Println("Beginning Run")
+                       singlerun()
+                       log.Printf("Sleeping for %d minutes", minutesBetweenRuns)
+                       time.Sleep(waitTime)
+               }
+       }
+}
 
+func singlerun() {
        arv, err := arvadosclient.MakeArvadosClient()
        if err != nil {
                log.Fatalf("Error setting up arvados client %s", err.Error())
@@ -45,10 +63,10 @@ func main() {
        }
 
        var arvLogger *logger.Logger
-       if logEventType != "" {
+       if logEventTypePrefix != "" {
                arvLogger = logger.NewLogger(logger.LoggerParams{Client: arv,
-                       EventType:     logEventType,
-                       WriteInterval: time.Second * time.Duration(logFrequencySeconds)})
+                       EventTypePrefix: logEventTypePrefix,
+                       WriteInterval:   time.Second * time.Duration(logFrequencySeconds)})
        }
 
        loggerutil.LogRunInfo(arvLogger)
@@ -77,7 +95,7 @@ func main() {
        // not wait for the timer before exiting.
        if arvLogger != nil {
                arvLogger.FinalUpdate(func(p map[string]interface{}, e map[string]interface{}) {
-                       p["run_info"].(map[string]interface{})["time_finished"] = time.Now()
+                       p["run_info"].(map[string]interface{})["finished_at"] = time.Now()
                })
        }
 }