lint fix

TUM-Dev · Dec 3, 2024 · 5be048f · 5be048f
1 parent 01380c0
commit 5be048f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 21 deletions.
diff --git a/api/runner_grpc.go b/api/runner_grpc.go
@@ -508,7 +508,7 @@ func NotifyRunnerAssignments(dao dao.DaoWrapper) func() {
 			logger.Error("Can't get running actions", err)
 		}
 		for _, action := range activeAction {
-			if action.End.Before(time.Now().Add(5 * time.Minute)) {
+			if action.End.Before(time.Now().Add(-5 * time.Minute)) {
 				action.SetToIgnored()
 				err = dao.ActionDao.UpdateAction(ctx, &action)
 				log.Info("Action ignored, check for progress manually", "action", action.ID)
@@ -619,7 +619,13 @@ func AssignRunnerAction(dao dao.DaoWrapper, action *model.Action) error {
 		//TranscodingRequest(ctx, dao, runner)
 		break
 	}
-	action.SetToRunning()
+	//action.SetToRunning()
+	err = dao.ActionDao.UpdateAction(ctx, action)
+	if err != nil {
+		logger.Error("couldn't update action!", "error", err)
+		return err
+	}
+	logger.Info("runner counts", "count", len(action.AllRunners))
 	return nil
 }
 
@@ -640,6 +646,7 @@ func CreateJob(dao dao.DaoWrapper, ctx context.Context, values map[string]interf
 			Status: 3,
 			Type:   "stream",
 			Values: string(value),
+			End:    values["end"].(time.Time),
 		})
 		job.Actions = append(job.Actions, actions...)
 		break
@@ -648,6 +655,7 @@ func CreateJob(dao dao.DaoWrapper, ctx context.Context, values map[string]interf
 			Status: 3,
 			Type:   "transcode",
 			Values: string(value),
+			End:    values["end"].(time.Time),
 		})
 		job.Actions = append(job.Actions, actions...)
 		break
@@ -656,6 +664,7 @@ func CreateJob(dao dao.DaoWrapper, ctx context.Context, values map[string]interf
 			Status: 3,
 			Type:   "upload",
 			Values: string(value),
+			End:    values["end"].(time.Time),
 		})
 		job.Actions = append(job.Actions, actions...)
 		break

diff --git a/model/action.go b/model/action.go
@@ -64,6 +64,7 @@ func (a *Action) IsCompleted() bool {
 }
 
 func (a *Action) GetCurrentRunner() (*Runner, error) {
+	logger.Info("runner count", "info", a)
 	if len(a.AllRunners) == 0 {
 		return nil, errors.New("no runner assigned")
 	}
@@ -72,6 +73,7 @@ func (a *Action) GetCurrentRunner() (*Runner, error) {
 
 func (a *Action) AssignRunner(runner Runner) {
 	a.AllRunners = append(a.AllRunners, runner)
+	logger.Info("runner count", "count", len(a.AllRunners))
 }
 
 func (a *Action) GetValues() string {

diff --git a/runner/ServerHandler.go b/runner/ServerHandler.go
@@ -78,10 +78,12 @@ func (r *Runner) ReadDiagnostics(retries int) {
 		return
 	}
 	actions := ""
-	for id, _ := range r.activeActions {
+	for id := range r.activeActions {
 		actions += fmt.Sprintln(id + ",")
 	}
 
+	r.log.Info("current actions of runner", "actions", actions)
+
 	_, err = con.Heartbeat(context.Background(), &protobuf.HeartbeatRequest{
 		Hostname:      r.cfg.Hostname,
 		Port:          int32(r.cfg.Port),

diff --git a/web/ts/runner.ts b/web/ts/runner.ts
@@ -30,32 +30,30 @@ export function getFailedAction(): void {
             );
         });
     });
-    r
+    r;
 }
 
 export function listActions(actions: string): void {
     window.dispatchEvent(new CustomEvent("load-actions"));
     actions.split(",\n").forEach((id) => {
-            if (id === "") {
-                return;
-            }
-            fetch("/api/Actions/" + id).then((res) => {
-                res.text().then((text) => {
-                    window.dispatchEvent(
-                        new CustomEvent("ActionListing", {
-                            detail: {
-                                actions: JSON.parse(text),
-                            },
-                        }),
-                    );
-                });
-            });
+        if (id === "") {
+            return;
         }
-    );
-    var actionwindow = document.getElementById("actionList");
+        fetch("/api/Actions/" + id).then((res) => {
+            res.text().then((text) => {
+                window.dispatchEvent(
+                    new CustomEvent("ActionListing", {
+                        detail: {
+                            actions: JSON.parse(text),
+                        },
+                    }),
+                );
+            });
+        });
+    });
+    const actionwindow = document.getElementById("actionList");
     actionwindow.classList.toggle("show");
 
     console.log(actionwindow.style.getPropertyValue("visibility"));
     //actionwindow.classList.add
-
 }