]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2772 from ceph/wip-init-radosgw
authorLoic Dachary <loic-201408@dachary.org>
Thu, 13 Nov 2014 20:58:45 +0000 (21:58 +0100)
committerLoic Dachary <loic-201408@dachary.org>
Thu, 13 Nov 2014 20:58:45 +0000 (21:58 +0100)
init-radosgw.sysv: set ulimit -n before starting daemon

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/init-radosgw.sysv

index 3285ed925f5743c423f0c815fd5eb6ad8d87de80,76b83d8a316fe25aef43ad50c01716401a1e3c35..e7c9db570f722c33700ed016d928ae1574a184f9
@@@ -84,11 -84,11 +84,11 @@@ case "$1" i
                  chown $user $log_file
              fi
  
 -            if [ $SYSTEMD -eq 1 ]; then
 -                systemd-run -r bash -c "ulimit -n 32768; $RADOSGW -n $name"
 +            if [ -n "$SYSTEMD_RUN" ]; then
 +                $SYSTEMD_RUN -r bash -c "ulimit -n 32768; $RADOSGW -n $name"
              else
-                 #start-stop-daemon --start -u $user -x $RADOSGW -- -n $name
-                 daemon --user="$user" "ulimit -n 32768; $RADOSGW -n $name"
+               ulimit -n 32768
+                 daemon --user="$user" "$RADOSGW -n $name"
              fi
              echo "Starting $name..."
          done