Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
da0c543e
Commit
da0c543e
authored
May 21, 2017
by
Kamil Trzcinski
Committed by
Z.J. van de Weg
May 22, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add MISSING e-tag refresh of resource for Job, and Pipeline Graph
parent
33961ee4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
0 deletions
+47
-0
app/models/commit_status.rb
app/models/commit_status.rb
+1
-0
app/workers/expire_job_cache_worker.rb
app/workers/expire_job_cache_worker.rb
+37
-0
app/workers/expire_pipeline_cache_worker.rb
app/workers/expire_pipeline_cache_worker.rb
+9
-0
No files found.
app/models/commit_status.rb
View file @
da0c543e
...
@@ -89,6 +89,7 @@ class CommitStatus < ActiveRecord::Base
...
@@ -89,6 +89,7 @@ class CommitStatus < ActiveRecord::Base
else
else
PipelineUpdateWorker
.
perform_async
(
pipeline
.
id
)
PipelineUpdateWorker
.
perform_async
(
pipeline
.
id
)
end
end
ExpireJobCacheWorker
.
perform_async
(
pipeline
.
id
,
commit_status
.
id
)
end
end
end
end
end
end
...
...
app/workers/expire_job_cache_worker.rb
0 → 100644
View file @
da0c543e
class
ExpireJobCacheWorker
include
Sidekiq
::
Worker
include
BuildQueue
def
perform
(
pipeline_id
,
job_id
)
job
=
CommitStatus
.
joins
(
:pipeline
,
:project
).
find_by
(
id:
job
)
return
unless
job
pipeline
=
job
.
pipeline
project
=
job
.
project
store
.
touch
(
project_pipeline_path
(
project
,
pipeline
))
store
.
touch
(
project_job_path
(
project
,
job
))
end
private
def
project_pipeline_path
(
project
,
pipeline
)
Gitlab
::
Routing
.
url_helpers
.
namespace_project_pipeline_path
(
project
.
namespace
,
project
,
pipeline
,
format: :json
)
end
def
project_job_path
(
project
,
job
)
Gitlab
::
Routing
.
url_helpers
.
namespace_project_build_path
(
project
.
namespace
,
project
,
job
.
id
,
format: :json
)
end
def
store
@store
||=
Gitlab
::
EtagCaching
::
Store
.
new
end
end
app/workers/expire_pipeline_cache_worker.rb
View file @
da0c543e
...
@@ -10,6 +10,7 @@ class ExpirePipelineCacheWorker
...
@@ -10,6 +10,7 @@ class ExpirePipelineCacheWorker
store
=
Gitlab
::
EtagCaching
::
Store
.
new
store
=
Gitlab
::
EtagCaching
::
Store
.
new
store
.
touch
(
project_pipelines_path
(
project
))
store
.
touch
(
project_pipelines_path
(
project
))
store
.
touch
(
project_pipeline_path
(
project
,
pipeline
))
store
.
touch
(
commit_pipelines_path
(
project
,
pipeline
.
commit
))
if
pipeline
.
commit
store
.
touch
(
commit_pipelines_path
(
project
,
pipeline
.
commit
))
if
pipeline
.
commit
store
.
touch
(
new_merge_request_pipelines_path
(
project
))
store
.
touch
(
new_merge_request_pipelines_path
(
project
))
each_pipelines_merge_request_path
(
project
,
pipeline
)
do
|
path
|
each_pipelines_merge_request_path
(
project
,
pipeline
)
do
|
path
|
...
@@ -28,6 +29,14 @@ class ExpirePipelineCacheWorker
...
@@ -28,6 +29,14 @@ class ExpirePipelineCacheWorker
format: :json
)
format: :json
)
end
end
def
project_pipeline_path
(
project
,
pipeline
)
Gitlab
::
Routing
.
url_helpers
.
namespace_project_pipeline_path
(
project
.
namespace
,
project
,
pipeline
,
format: :json
)
end
def
commit_pipelines_path
(
project
,
commit
)
def
commit_pipelines_path
(
project
,
commit
)
Gitlab
::
Routing
.
url_helpers
.
pipelines_namespace_project_commit_path
(
Gitlab
::
Routing
.
url_helpers
.
pipelines_namespace_project_commit_path
(
project
.
namespace
,
project
.
namespace
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment