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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
08a6d18b
Commit
08a6d18b
authored
Jul 04, 2021
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure any args are passed onto sidekiq
parent
6d70e7d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
bin/background_jobs_sk
bin/background_jobs_sk
+5
-5
bin/background_jobs_sk_cluster
bin/background_jobs_sk_cluster
+6
-6
No files found.
bin/background_jobs_sk
View file @
08a6d18b
...
...
@@ -24,13 +24,13 @@ restart()
fi
pkill
-u
$gitlab_user
-f
'sidekiq [0-9]'
start_sidekiq
-P
$sidekiq_pidfile
-d
-L
$sidekiq_logfile
>>
$sidekiq_logfile
2>&1
start_sidekiq
-P
$sidekiq_pidfile
-d
-L
$sidekiq_logfile
"
$@
"
>>
$sidekiq_logfile
2>&1
}
# Starts on foreground but output to the logfile instead stdout.
start_silent
()
{
start_sidekiq
>>
$sidekiq_logfile
2>&1
start_sidekiq
"
$@
"
>>
$sidekiq_logfile
2>&1
}
start_sidekiq
()
...
...
@@ -50,17 +50,17 @@ case "$1" in
stop
;;
start
)
restart
restart
"
$@
"
;;
start_silent
)
warn
"Deprecated: Will be removed at 13.0 (see https://gitlab.com/gitlab-org/gitlab/-/issues/196731)."
start_silent
;;
start_foreground
)
start_sidekiq
start_sidekiq
"
$@
"
;;
restart
)
restart
restart
"
$@
"
;;
*
)
echo
"Usage: RAILS_ENV=<env>
$0
{stop|start|start_silent|start_foreground|restart}"
...
...
bin/background_jobs_sk_cluster
View file @
08a6d18b
...
...
@@ -11,7 +11,7 @@ warn()
echo
"
$@
"
1>&2
}
get_sidekiq_pid
()
get_sidekiq_pid
()
{
if
[
!
-f
$sidekiq_pidfile
]
;
then
warn
"No pidfile found at
$sidekiq_pidfile
; is Sidekiq running?"
...
...
@@ -37,7 +37,7 @@ restart()
fi
warn
"Sidekiq output will be written to
$sidekiq_logfile
"
start_sidekiq
>>
$sidekiq_logfile
2>&1
start_sidekiq
"
$@
"
>>
$sidekiq_logfile
2>&1
}
start_sidekiq
()
...
...
@@ -55,7 +55,7 @@ start_sidekiq()
processes_args+
=(
"*"
)
done
${
cmd
}
bin/sidekiq-cluster
"
${
processes_args
[@]
}
"
-P
$sidekiq_pidfile
-e
$RAILS_ENV
${
cmd
}
bin/sidekiq-cluster
"
${
processes_args
[@]
}
"
-P
$sidekiq_pidfile
-e
$RAILS_ENV
"
$@
"
}
case
"
$1
"
in
...
...
@@ -63,13 +63,13 @@ case "$1" in
stop
;;
start
)
restart &
restart
"
$@
"
&
;;
start_foreground
)
start_sidekiq
start_sidekiq
"
$@
"
;;
restart
)
restart &
restart
"
$@
"
&
;;
*
)
echo
"Usage: RAILS_ENV=<env> SIDEKIQ_WORKERS=<n>
$0
{stop|start|start_foreground|restart}"
...
...
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