Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Job Queues
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OSS
Libraries
Go
Services
Job Queues
Commits
672bdacd
Verified
Commit
672bdacd
authored
1 year ago
by
Volker Schukai
Browse files
Options
Downloads
Patches
Plain Diff
fix: stats should not deleted, but reset
#22
parent
27406419
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
database.go
+11
-6
11 additions, 6 deletions
database.go
manager.go
+6
-6
6 additions, 6 deletions
manager.go
with
17 additions
and
12 deletions
database.go
+
11
−
6
View file @
672bdacd
...
@@ -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
)
Del
et
e
Logs
(
job
GenericJob
)
error
{
func
(
s
*
DBSaver
)
Res
etLogs
(
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
)
Del
et
e
Stats
(
job
GenericJob
)
error
{
func
(
s
*
DBSaver
)
Res
etStats
(
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
...
...
This diff is collapsed.
Click to expand it.
manager.go
+
6
−
6
View file @
672bdacd
...
@@ -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
)
}
}
//
Del
et
e
JobLogs deletes the logs of a job
//
Res
etJobLogs deletes the logs of a job
func
(
m
*
Manager
)
Del
et
e
JobLogs
(
id
JobID
)
error
{
func
(
m
*
Manager
)
Res
etJobLogs
(
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
.
Del
et
e
Logs
(
m
.
activeJobs
[
id
])
err
:=
m
.
dbSaver
.
Res
etLogs
(
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
}
}
//
Del
et
e
JobStats deletes the stats of a job
//
Res
etJobStats deletes the stats of a job
func
(
m
*
Manager
)
Del
et
e
JobStats
(
id
JobID
)
error
{
func
(
m
*
Manager
)
Res
etJobStats
(
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
.
Del
et
e
Stats
(
m
.
activeJobs
[
id
])
err
:=
m
.
dbSaver
.
Res
etStats
(
m
.
activeJobs
[
id
])
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment