@@ -87,7 +87,10 @@ func worker(ctx context.Context, msg modelmain.WorkerTaskSend) {
8787 log .Println (errl .Error ())
8888 }
8989
90- WSLogError ("Lock for run and node exists:" + errl .Error (), msg , TaskUpdate )
90+ log .Println ("Lock for run and node exists:" , msg .RunID , msg .NodeID )
91+
92+ // == NB: this should be a silent fail and continue, the below will fail the entire graph
93+ SilentWSLogError ("Lock for run and node exists:" + errl .Error (), msg )
9194
9295 return
9396 }
@@ -96,14 +99,14 @@ func worker(ctx context.Context, msg modelmain.WorkerTaskSend) {
9699 var lockCheck modelmain.WorkerTasks
97100 err2 := database .DBConn .Select ("task_id" , "status" ).Where ("task_id = ? and environment_id= ?" , msg .TaskID , msg .EnvironmentID ).First (& lockCheck ).Error
98101 if err2 != nil {
99- log .Println (err2 .Error ())
100- WSLogError ("Task already running:" + err2 .Error (), msg , TaskUpdate )
102+ log .Println ("Task already running" , err2 .Error ())
103+ SilentWSLogError ("Task already running:" + err2 .Error (), msg )
101104 return
102105 }
103106
104107 if lockCheck .Status != "Queue" {
105108 log .Println ("Skipping not in queue" , msg .RunID , msg .NodeID )
106- WSLogError ("Skipping not in queue - runid:" + msg .RunID + " - node:" + msg .NodeID , msg , TaskUpdate )
109+ SilentWSLogError ("Skipping not in queue - runid:" + msg .RunID + " - node:" + msg .NodeID , msg )
107110 return
108111 }
109112
@@ -114,7 +117,7 @@ func worker(ctx context.Context, msg modelmain.WorkerTaskSend) {
114117 err2 = database .DBConn .Select ("run_id" , "status" ).Where ("run_id = ?" , msg .RunID ).First (& pipelineCheck ).Error
115118 if err2 != nil {
116119 log .Println (err2 .Error ())
117- WSLogError ("Skipping not in queue - runid:" + msg .RunID + " - node:" + msg .NodeID , msg , TaskUpdate )
120+ WSLogError ("Pipeline marked as failed - runid:" + msg .RunID + " - node:" + msg .NodeID , msg , TaskUpdate )
118121 return
119122 }
120123
0 commit comments