From c465da9fd927d86213a2bffc4d03c315a045832d Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sun, 5 May 2024 14:52:18 +0200
Subject: [PATCH] fix: deletejob have not to check active jobs #66
---
go.mod | 2 +-
go.sum | 3 ++-
manager.go | 10 +++-------
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/go.mod b/go.mod
index 196794e..edddb38 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/net v0.21.0 // indirect
- golang.org/x/sys v0.19.0 // indirect
+ golang.org/x/sys v0.20.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
)
diff --git a/go.sum b/go.sum
index e8af371..5fc6b89 100644
--- a/go.sum
+++ b/go.sum
@@ -138,8 +138,9 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/manager.go b/manager.go
index 53e4764..5f88677 100644
--- a/manager.go
+++ b/manager.go
@@ -136,6 +136,7 @@ func (m *Manager) GetActiveJobs() map[JobID]GenericJob {
}
// DeleteJob removes a job from the active jobs and the database
+// If you want to remove a job from the active jobs, use RemoveJob instead
func (m *Manager) DeleteJob(id JobID) error {
if m == nil {
@@ -148,13 +149,8 @@ func (m *Manager) DeleteJob(id JobID) error {
var job GenericJob
var ok bool
- if job, ok = m.activeJobs[id]; !ok {
- return ErrJobNotActive
- }
-
- err := m.removeJobInternal(id)
- if err != nil {
- return err
+ if job, ok = m.activeJobs[id]; ok {
+ _ = m.removeJobInternal(id)
}
if m.jobSyncer != nil {
--
GitLab