diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-02 20:33:37 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-02 20:33:37 +0300 |
| commit | 44b4c9d0607ace550fdd9c4d0d515b5cbedd35a5 (patch) | |
| tree | 7d42677e90de7ac5872203c6f809aa74bf1ed76c /lib | |
| parent | 752468d55bb167cfb7d327c660a62caa52dac792 (diff) | |
| parent | 5287da7412e01ac1508bd15bec5bae7c3a0afa1b (diff) | |
Merge branch 'patch-1' into 'master'
Consistent rails_socket use.
[ci skip]
See merge request !2596
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/support/init.d/gitlab | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab index 1633891c8a0..9e90a99f15b 100755 --- a/lib/support/init.d/gitlab +++ b/lib/support/init.d/gitlab @@ -219,7 +219,7 @@ start_gitlab() { echo "The Unicorn web server already running with pid $wpid, not restarting." else # Remove old socket if it exists - rm -f "$socket_path"/gitlab.socket 2>/dev/null + rm -f "$rails_socket" 2>/dev/null # Start the web server RAILS_ENV=$RAILS_ENV bin/web start fi |