diff options
| author | Andreas Maunz <andreas@maunz.de> | 2011-11-17 10:02:47 +0100 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2011-11-17 10:02:47 +0100 |
| commit | 6857244ddd2fd79f2a8f70341227e7ebdcf34b05 (patch) | |
| tree | a3ce41e0c28f9239f3571ef08c66e89897e22649 | |
| parent | 64e21f3e1916c989786a2c329e922f7932e330ee (diff) | |
Fixed otconfig in ot-functions
| -rw-r--r-- | ot-tools-root.sh | 11 | ||||
| -rw-r--r-- | ot-tools-user.sh | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/ot-tools-root.sh b/ot-tools-root.sh index b6ebfcc..7e1233b 100644 --- a/ot-tools-root.sh +++ b/ot-tools-root.sh @@ -50,9 +50,10 @@ otupdate() { # Start the server otstart() { + otconfig otkill - sudo bash -c "source $HOME/.opentox-ui.sh; nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" - sudo bash -c "source $HOME/.opentox-ui.sh; nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" + sudo bash -c "nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" + sudo bash -c "nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" sleep 2 if ! pgrep -u root nginx>/dev/null 2>&1; then echo "Failed to start nginx."; fi if ! pgrep -u root redis-server>/dev/null 2>&1; then echo "Failed to start redis."; fi @@ -66,13 +67,15 @@ alias ottail='tail -f $HOME/.opentox/log/production.log' # Reload the server otreload() { - sudo bash -c "source $HOME/.opentox-ui.sh; nginx -s reload" + otconfig + sudo bash -c "nginx -s reload" } # Kill the server otkill() { + otconfig sudo killall -u root nginx >/dev/null 2>&1 - sudo bash -c "source $HOME/.opentox-ui.sh; redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" + sudo bash -c "redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" while sudo ps x | grep PassengerWatchdog | grep -v grep >/dev/null 2>&1; do sleep 1; done while sudo ps x | grep Rack | grep -v grep >/dev/null 2>&1; do sleep 1; done for p in `pgrep -u root R 2>/dev/null`; do sudo kill -9 $p; done diff --git a/ot-tools-user.sh b/ot-tools-user.sh index ede3d7b..1ad02f4 100644 --- a/ot-tools-user.sh +++ b/ot-tools-user.sh @@ -50,9 +50,10 @@ otupdate() { # Start the server otstart() { + otconfig otkill - bash -c "source $HOME/.opentox-ui.sh; nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" - bash -c "source $HOME/.opentox-ui.sh; nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" + bash -c "nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" + bash -c "nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" sleep 2 if ! pgrep -u $USER nginx>/dev/null 2>&1; then echo "Failed to start nginx."; fi if ! pgrep -u $USER redis-server>/dev/null 2>&1; then echo "Failed to start redis."; fi @@ -66,13 +67,15 @@ alias ottail='tail -f $HOME/.opentox/log/production.log' # Reload the server otreload() { - bash -c "source $HOME/.opentox-ui.sh; nginx -s reload" + otconfig + bash -c "nginx -s reload" } # Kill the server otkill() { + otconfig killall nginx >/dev/null 2>&1 - bash -c "source $HOME/.opentox-ui.sh; redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" + bash -c "redis-cli -p $OHM_PORT shutdown >/dev/null 2>&1" while ps x | grep PassengerWatchdog | grep -v grep >/dev/null 2>&1; do sleep 1; done while ps x | grep Rack | grep -v grep >/dev/null 2>&1; do sleep 1; done for p in `pgrep -u $USER R 2>/dev/null`; do kill -9 $p; done |