Skip to content
Snippets Groups Projects
Verified Commit 672bdacd authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix: stats should not deleted, but reset #22

parent 27406419
No related branches found
No related tags found
No related merge requests found
...@@ -241,7 +241,7 @@ func (s *DBSaver) DeleteJob(job GenericJob) error { ...@@ -241,7 +241,7 @@ func (s *DBSaver) DeleteJob(job GenericJob) error {
} }
func (s *DBSaver) DeleteLogs(job GenericJob) error { func (s *DBSaver) ResetLogs(job GenericJob) error {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()
var db *gorm.DB var db *gorm.DB
...@@ -254,7 +254,8 @@ func (s *DBSaver) DeleteLogs(job GenericJob) error { ...@@ -254,7 +254,8 @@ func (s *DBSaver) DeleteLogs(job GenericJob) error {
return db.Transaction(func(tx *gorm.DB) error { return db.Transaction(func(tx *gorm.DB) error {
permJob := job.GetPersistence() permJob := job.GetPersistence()
dbErr := tx.Where("job_id = ?", permJob.GetID()).Delete(&JobLog{}).Error // unscoped because we want to delete the logs finally
dbErr := tx.Unscoped().Where("job_id = ?", permJob.GetID()).Delete(&JobLog{}).Error
if dbErr != nil { if dbErr != nil {
return dbErr return dbErr
} }
...@@ -263,7 +264,7 @@ func (s *DBSaver) DeleteLogs(job GenericJob) error { ...@@ -263,7 +264,7 @@ func (s *DBSaver) DeleteLogs(job GenericJob) error {
}) })
} }
func (s *DBSaver) DeleteStats(job GenericJob) error { func (s *DBSaver) ResetStats(job GenericJob) error {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock() defer s.mu.Unlock()
var db *gorm.DB var db *gorm.DB
...@@ -276,9 +277,13 @@ func (s *DBSaver) DeleteStats(job GenericJob) error { ...@@ -276,9 +277,13 @@ func (s *DBSaver) DeleteStats(job GenericJob) error {
return db.Transaction(func(tx *gorm.DB) error { return db.Transaction(func(tx *gorm.DB) error {
permJob := job.GetPersistence() permJob := job.GetPersistence()
dbErr := tx.Where("job_id = ?", permJob.GetID()).Delete(&JobStats{}).Error permJob.Stats = JobStats{
if dbErr != nil { JobID: permJob.GetID(),
return dbErr }
txErr := tx.Model(&permJob).Updates(permJob).Error
if txErr != nil {
return txErr
} }
return nil return nil
......
...@@ -149,8 +149,8 @@ func (m *Manager) RemoveJob(id JobID) error { ...@@ -149,8 +149,8 @@ func (m *Manager) RemoveJob(id JobID) error {
return m.removeJobInternal(id) return m.removeJobInternal(id)
} }
// DeleteJobLogs deletes the logs of a job // ResetJobLogs deletes the logs of a job
func (m *Manager) DeleteJobLogs(id JobID) error { func (m *Manager) ResetJobLogs(id JobID) error {
m.mu.Lock() m.mu.Lock()
defer m.mu.Unlock() defer m.mu.Unlock()
...@@ -160,7 +160,7 @@ func (m *Manager) DeleteJobLogs(id JobID) error { ...@@ -160,7 +160,7 @@ func (m *Manager) DeleteJobLogs(id JobID) error {
if m.dbSaver != nil { if m.dbSaver != nil {
err := m.dbSaver.DeleteLogs(m.activeJobs[id]) err := m.dbSaver.ResetLogs(m.activeJobs[id])
if err != nil { if err != nil {
return err return err
} }
...@@ -169,8 +169,8 @@ func (m *Manager) DeleteJobLogs(id JobID) error { ...@@ -169,8 +169,8 @@ func (m *Manager) DeleteJobLogs(id JobID) error {
return nil return nil
} }
// DeleteJobStats deletes the stats of a job // ResetJobStats deletes the stats of a job
func (m *Manager) DeleteJobStats(id JobID) error { func (m *Manager) ResetJobStats(id JobID) error {
m.mu.Lock() m.mu.Lock()
defer m.mu.Unlock() defer m.mu.Unlock()
...@@ -180,7 +180,7 @@ func (m *Manager) DeleteJobStats(id JobID) error { ...@@ -180,7 +180,7 @@ func (m *Manager) DeleteJobStats(id JobID) error {
if m.dbSaver != nil { if m.dbSaver != nil {
err := m.dbSaver.DeleteStats(m.activeJobs[id]) err := m.dbSaver.ResetStats(m.activeJobs[id])
if err != nil { if err != nil {
return err return err
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment