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
Boxiang Sun
gitlab-ce
Commits
988ac03b
Commit
988ac03b
authored
10 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'careful_sidekiq_kill' into 'master'
Be more selective when killing stray Sidekiqs
parents
11e1c013
8e2752f4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
bin/background_jobs
bin/background_jobs
+1
-1
No files found.
CHANGELOG
View file @
988ac03b
...
...
@@ -32,6 +32,7 @@ v 7.0.0
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- Overall performance improvements
- Skip init script check on omnibus-gitlab
- Be more selective when killing stray Sidekiqs
v 6.9.2
- Revert the commit that broke the LDAP user filter
...
...
This diff is collapsed.
Click to expand it.
bin/background_jobs
View file @
988ac03b
...
...
@@ -18,7 +18,7 @@ function stop
function
killall
{
pkill
-u
$gitlab_user
-f
sidekiq
pkill
-u
$gitlab_user
-f
'sidekiq [0-9]'
}
function
restart
...
...
This diff is collapsed.
Click to expand it.
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