minimize code + schedulerd naming + docker

daemons/execute_monitor_local.go

@@ -1,47 +1,41 @@
 package daemons
 
 import (
-	"oc-scheduler/conf"
-	"oc-scheduler/logger"
+	"oc-schedulerd/conf"
 	"os/exec"
+
+	"github.com/rs/zerolog"
 )
 
-type LocalMonitor struct{
-	LokiURL 		string
-	KubeURL			string
-	WorkflowName	string
+type LocalMonitor struct {
+	LokiURL      string
+	KubeURL      string
+	WorkflowName string
+	Logger       zerolog.Logger
 }
 
-func (lm *LocalMonitor) LaunchLocalMonitor (){
-	if (lm.LokiURL == "" || lm.KubeURL == "" || lm.WorkflowName == ""){
-		logger.Logger.Error().Msg("Missing parameter in LocalMonitor")
+func (lm *LocalMonitor) LaunchLocalMonitor() {
+	if lm.LokiURL == "" || lm.KubeURL == "" || lm.WorkflowName == "" {
+		lm.Logger.Error().Msg("Missing parameter in LocalMonitor")
 	}
 
 	// For dev purposes, in prod KubeURL must be a kube API's URL
-	if(lm.KubeURL == "localhost"){
+	if lm.KubeURL == "localhost" {
 		lm.execLocalKube()
-	} else{
+	} else {
 		lm.execRemoteKube()
 	}
 }
 
-func (lm *LocalMonitor) execLocalKube (){
-	// kube_url := ""
-	cmd := exec.Command("../oc-monitor/oc-monitor", "-w",lm.WorkflowName, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl,"-d", conf.GetConfig().DBName)
-	// cmd_ls := exec.Command("ls", "../oc-monitor")
+func (lm *LocalMonitor) execLocalKube() {
+	cmd := exec.Command(conf.GetConfig().MonitorPath, "-w", lm.WorkflowName, "-u", lm.LokiURL, "-m", conf.GetConfig().MongoUrl, "-d", conf.GetConfig().DBName)
 	err := cmd.Start()
-	// output, err := cmd_ls.CombinedOutput()
-	if err !=nil {
-		logger.Logger.Error().Msg("Could not start oc-monitor for " + lm.WorkflowName + " : " + err.Error())
+	if err != nil {
+		lm.Logger.Error().Msg("Could not start oc-monitor for " + lm.WorkflowName + " : " + err.Error())
 	}
-
 }
 
-
-func (lm *LocalMonitor) execRemoteKube (){
+// TODO : implement this
+func (lm *LocalMonitor) execRemoteKube() {
 
 }
-
-func (lm *LocalMonitor) todo (){
-
-}