1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/669da7067315/ Changeset: 669da7067315 User: jmchilton Date: 2015-01-23 20:12:24+00:00 Summary: Merged in nsoranzo/galaxy-central (pull request #646) Update rolling_restart.sh to treat .venv dir and GALAXY_CONFIG_FILE env variable as run.sh Affected #: 2 files diff -r de9bd9d7d47bfcdf45f3f170be391874b79e738f -r 669da7067315a6ce236a2ee753e9af6264279c01 rolling_restart.sh --- a/rolling_restart.sh +++ b/rolling_restart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh cd `dirname $0` check_if_not_started(){ @@ -8,7 +8,7 @@ current_pid_in_file=$(cat $2); # If they're equivalent, then the current pid file agrees with our logs # and we've succesfully started - if [[ $latest_pid -eq $current_pid_in_file ]]; + if [ $latest_pid -eq $current_pid_in_file ]; then echo 0; else @@ -16,17 +16,29 @@ fi } +# If there is a .venv/ directory, assume it contains a virtualenv that we +# should run this instance in. +if [ -d .venv ]; +then + . .venv/bin/activate +fi -GALAXY_CONFIG_FILE=config/galaxy.ini -if [ ! -f $GALAXY_CONFIG_FILE ]; then - GALAXY_CONFIG_FILE=universe_wsgi.ini +if [ -z "$GALAXY_CONFIG_FILE" ]; then + if [ -f universe_wsgi.ini ]; then + GALAXY_CONFIG_FILE=universe_wsgi.ini + elif [ -f config/galaxy.ini ]; then + GALAXY_CONFIG_FILE=config/galaxy.ini + else + GALAXY_CONFIG_FILE=config/galaxy.ini.sample + fi + export GALAXY_CONFIG_FILE fi servers=`sed -n 's/^\[server:\(.*\)\]/\1/ p' $GALAXY_CONFIG_FILE | xargs echo` for server in $servers; do # If there's a pid - if [[ -e $server.pid ]] + if [ -e $server.pid ] then # Then kill it echo "Killing $server" @@ -44,12 +56,11 @@ pid=`cat $server.pid` result=1 # Wait for the latest pid in the file to be the pid we've grabbed - while [[ $result -eq 1 ]] + while [ $result -eq 1 ] do result=$(check_if_not_started $server.log $server.pid) - echo -n "." + printf "." sleep 1 done - echo "" + echo done - diff -r de9bd9d7d47bfcdf45f3f170be391874b79e738f -r 669da7067315a6ce236a2ee753e9af6264279c01 scripts/build_universe_config.py --- a/scripts/build_universe_config.py +++ b/scripts/build_universe_config.py @@ -6,7 +6,10 @@ def merge(): - "Merges all .ini files in a specified directory into ./universe.ini" + """ + Merges all .ini files in a specified directory into a file (defaults to + ./config/galaxy.ini ). + """ if len(argv) < 2: message = "%s: Must specify directory to merge configuration files from." % argv[0] raise Exception(message) Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.