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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
552e42f6
Commit
552e42f6
authored
Jan 27, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2768 from rlaneve/feature/queued-web-hooks
Updates web hooks to process via queue
parents
ce0ec05c
8a65229b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
3 deletions
+16
-3
Procfile
Procfile
+1
-1
app/models/project.rb
app/models/project.rb
+1
-1
app/models/web_hook.rb
app/models/web_hook.rb
+4
-0
app/workers/project_web_hook_worker.rb
app/workers/project_web_hook_worker.rb
+9
-0
lib/tasks/sidekiq.rake
lib/tasks/sidekiq.rake
+1
-1
No files found.
Procfile
View file @
552e42f6
web: bundle exec unicorn_rails -p $PORT
web: bundle exec unicorn_rails -p $PORT
worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
worker: bundle exec sidekiq -q post_receive,mailer,system_hook,
project_web_hook,
common,default
app/models/project.rb
View file @
552e42f6
...
@@ -340,7 +340,7 @@ class Project < ActiveRecord::Base
...
@@ -340,7 +340,7 @@ class Project < ActiveRecord::Base
end
end
def
execute_hooks
(
data
)
def
execute_hooks
(
data
)
hooks
.
each
{
|
hook
|
hook
.
execute
(
data
)
}
hooks
.
each
{
|
hook
|
hook
.
async_
execute
(
data
)
}
end
end
def
execute_services
(
data
)
def
execute_services
(
data
)
...
...
app/models/web_hook.rb
View file @
552e42f6
...
@@ -34,4 +34,8 @@ class WebHook < ActiveRecord::Base
...
@@ -34,4 +34,8 @@ class WebHook < ActiveRecord::Base
basic_auth:
{
username:
parsed_url
.
user
,
password:
parsed_url
.
password
})
basic_auth:
{
username:
parsed_url
.
user
,
password:
parsed_url
.
password
})
end
end
end
end
def
async_execute
(
data
)
Sidekiq
::
Client
.
enqueue
(
ProjectWebHookWorker
,
id
,
data
)
end
end
end
app/workers/project_web_hook_worker.rb
0 → 100644
View file @
552e42f6
class
ProjectWebHookWorker
include
Sidekiq
::
Worker
sidekiq_options
queue: :project_web_hook
def
perform
(
hook_id
,
data
)
WebHook
.
find
(
hook_id
).
execute
data
end
end
lib/tasks/sidekiq.rake
View file @
552e42f6
...
@@ -6,7 +6,7 @@ namespace :sidekiq do
...
@@ -6,7 +6,7 @@ namespace :sidekiq do
desc
"GITLAB | Start sidekiq"
desc
"GITLAB | Start sidekiq"
task
:start
do
task
:start
do
run
"nohup bundle exec sidekiq -q post_receive,mailer,system_hook,common,default -e
#{
Rails
.
env
}
-P
#{
pidfile
}
>>
#{
Rails
.
root
.
join
(
"log"
,
"sidekiq.log"
)
}
2>&1 &"
run
"nohup bundle exec sidekiq -q post_receive,mailer,system_hook,
project_web_hook,
common,default -e
#{
Rails
.
env
}
-P
#{
pidfile
}
>>
#{
Rails
.
root
.
join
(
"log"
,
"sidekiq.log"
)
}
2>&1 &"
end
end
def
pidfile
def
pidfile
...
...
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