summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-22 14:39:52 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-04-22 14:39:52 +0200
commit245b203b463c35504a7023246a9e45dbe3c8023a (patch)
tree4d2aa8ef76668caf059ebe0760e3f3d8d6edfdf2
parentb16ffe404d85180193f5a98a89b9019ea5b3be49 (diff)
parent693b1708eaa2ee8a00da894906509988cd884aa2 (diff)
downloadgitlab-ci-245b203b463c35504a7023246a9e45dbe3c8023a.tar.gz
Merge pull request #419 from cr7pt0gr4ph7/fix-init-d-output
Fix init.d script output
-rwxr-xr-xlib/support/init.d/gitlab_ci22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/support/init.d/gitlab_ci b/lib/support/init.d/gitlab_ci
index 7a959e2..a8893ae 100755
--- a/lib/support/init.d/gitlab_ci
+++ b/lib/support/init.d/gitlab_ci
@@ -161,7 +161,7 @@ start() {
# Then check if the service is running. If it is: don't start again.
if [ "$web_status" = "0" ]; then
- echo "The Unicorn web server already running with pid $wpid, not restarting."
+ echo "The GitLab CI Unicorn web server already running with pid $wpid, not restarting."
else
# Remove old socket if it exists
rm -f "$socket_path"/gitlab_ci.socket 2>/dev/null
@@ -171,7 +171,7 @@ start() {
# If sidekiq is already running, don't start it again.
if [ "$sidekiq_status" = "0" ]; then
- echo "The Sidekiq job dispatcher is already running with pid $spid, not restarting"
+ echo "The GitLab CI Sidekiq job dispatcher is already running with pid $spid, not restarting"
else
RAILS_ENV=$RAILS_ENV script/background_jobs start &
fi
@@ -187,11 +187,11 @@ stop() {
exit_if_not_running
if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
- echo -n "Shutting down both Unicorn and Sidekiq"
+ echo -n "Shutting down both GitLab CI Unicorn and Sidekiq"
elif [ "$web_status" = "0" ]; then
- echo -n "Shutting down Sidekiq"
+ echo -n "Shutting down GitLab CI Sidekiq"
elif [ "$sidekiq_status" = "0" ]; then
- echo -n "Shutting down Unicorn"
+ echo -n "Shutting down GitLab CI Unicorn"
fi
# If the Unicorn web server is running, tell it to stop;
@@ -226,21 +226,21 @@ stop() {
print_status() {
check_status
if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
- echo "GitLab is not running."
+ echo "GitLab CI is not running."
return
fi
if [ "$web_status" = "0" ]; then
- echo "The GitLab Unicorn web server with pid $wpid is running."
+ echo "The GitLab CI Unicorn web server with pid $wpid is running."
else
- printf "The GitLab Unicorn web server is \033[31mnot running\033[0m.\n"
+ printf "The GitLab CI Unicorn web server is \033[31mnot running\033[0m.\n"
fi
if [ "$sidekiq_status" = "0" ]; then
- echo "The GitLab Sidekiq job dispatcher with pid $spid is running."
+ echo "The GitLab CI Sidekiq job dispatcher with pid $spid is running."
else
- printf "The GitLab Sidekiq job dispatcher is \033[31mnot running\033[0m.\n"
+ printf "The GitLab CI Sidekiq job dispatcher is \033[31mnot running\033[0m.\n"
fi
if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
- printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
+ printf "GitLab CI and all its components are \033[32mup and running\033[0m.\n"
fi
}