From 014bde975757762a354a645c69d455783696f621 Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 5 May 2024 17:10:52 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20sql=20doesn=C2=B4t=20work=20#70?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
database.go | 15 ++++-----------
manager.go | 4 +++-
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/database.go b/database.go
index 155a244..2ad2aae 100644
--- a/database.go
+++ b/database.go
@@ -148,19 +148,12 @@ func update(job *JobPersistence, db *gorm.DB) error {
var stats JobStats
tx.Model(job.Stats).Where("job_id = ?", job.ID).
Assign(job.Stats).
- Omit("job_id", "created_at").
FirstOrCreate(&stats)
- //if tx.Error != nil {
- // return tx.Error
- //}
-
- //if err := tx.Model(job.Stats).
- // Select("*").
- // Omit("job_id", "created_at").
- // Updates(job.Stats).Error; err != nil {
- // return err // Fehler beim Update
- //}
+ tx.Model(job.Stats).
+ Select("*").
+ Omit("job_id", "created_at").
+ Updates(job.Stats)
}
for i := range job.Logs {
diff --git a/manager.go b/manager.go
index de2bfda..4a9e63f 100644
--- a/manager.go
+++ b/manager.go
@@ -249,7 +249,9 @@ func (m *Manager) ResetJobStats(id JobID) error {
m.mu.Lock()
defer m.mu.Unlock()
- if _, ok := m.activeJobs[id]; !ok {
+ if job, ok := m.activeJobs[id]; ok {
+ job.ResetStats()
+ } else {
return ErrJobNotActive
}
--
GitLab