85188ac087873b2964fcfbc3426694ca68bdd489 angie Wed May 22 10:33:21 2019 -0700 Reducing delay between calls to sessionDataConvert.sh because it's fairly lightweight and there are a lot of sessions to convert. refs #22440 diff --git src/hg/hgSession/convertUserSessions.sh src/hg/hgSession/convertUserSessions.sh index 2016cd3..b731698 100755 --- src/hg/hgSession/convertUserSessions.sh +++ src/hg/hgSession/convertUserSessions.sh @@ -1,55 +1,55 @@ #!/usr/bin/env bash HELP_STR="usage: convertUserSessions.sh userName userName must be %-encoded as it is in namedSessionDb" # cgiDir for hg.conf{,.private} settings cgiDir=/usr/local/apache/cgi-bin # delay (in seconds) between calls to sessionDataConvert.sh to avoid hammering server & hgcentral -delay=5 +delay=3 # Look for a setting in hg.conf (and hg.conf.private if not in hg.conf). function getSetting() { local settingName=$1 local settingVal=$(grep ^$settingName $cgiDir/hg.conf | sed -e 's/.*=//;') if [ "$settingVal" == "" -a -f $cgiDir/hg.conf.private ] ; then settingVal=$(grep ^$settingName $cgiDir/hg.conf.private | sed -e 's/.*=//;') fi if [ "$settingVal" == "" ]; then echo "Unable to find $settingName setting in cgi-bin hg.conf or hg.conf.private" exit 1 fi echo $settingVal } # Check args if [[ $# -eq 0 ]] ; then echo "$HELP_STR" exit 0 elif [[ $# -ne 1 ]] ; then echo "Wrong number of arguments ($#; need 1)" echo "$HELP_STR" exit 1 fi encUserName=$1 # Get sessions for user centralHost=$(getSetting "central.host") centralUser=$(getSetting "central.user") centralPwd=$(getSetting "central.password") centralDb=$(getSetting "central.db") sessionNames=$(mysql -h $centralHost -u $centralUser -p"$centralPwd" $centralDb \ -NBe "select sessionName from namedSessionDb where userName = '$encUserName'") # Save each one; quit if we encounter an error for encSessionName in $sessionNames ; do if sessionDataConvert.sh "$encUserName" "$encSessionName"; then echo "Converted $encUserName $encSessionName" else exit 1 fi echo -n "sleeping... " sleep $delay done