Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add test for device-gone notification by calling rq after gleaning

Browse source 
required params from logs.  So far testing only after game is over;
need to test mid-game deletion too.
This commit is contained in:
Andy2 2010-11-15 06:52:35 -08:00
parent d4e810c9cb
commit a69e2ad8be
1 changed files with 37 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
xwords4/linux/scripts/discon_ok2.sh
View file

@ -45,6 +45,35 @@ usage() {
exit 0
}
relayID() {
CONNNAME=""
HOSTID=""
SEED=""
LOG=$1
while read LINE; do
case "$LINE" in
*got_connect_cmd:\ connName* )
CONNNAME="$(echo $LINE | sed 's,^.*connName: "\(.*\)"$,\1,')"
;;
*hostid* )
HOSTID=$(echo $LINE | sed 's,^.*set hostid: \(.\)$,\1,')
;;
*getChannelSeed:\ channelSeed:*)
SEED=$(echo $LINE | sed 's,^.*getChannelSeed: channelSeed: \(.*\)$,\1,')
;;
esac
done < $LOG
if [ -z "${CONNNAME}" ]; then
echo "CONNNAME not found in $LOG" >&2
elif [ -z "${HOSTID}" ]; then
echo "HOSTID not found in $LOG" >&2
elif [ -z "${SEED}" ]; then
echo "SEED not found in $LOG" >&2
else
echo ${CONNNAME}:${HOSTID}/${SEED}
fi
}
connName() {
LOG=$1
grep 'got_connect_cmd: connName' $LOG | \
@ -64,7 +93,10 @@ declare -A CHECKED_ROOMS
check_room() {
ROOM=$1
if [ -z ${CHECKED_ROOMS[$ROOM]:-""} ]; then
NUM=$(echo "SELECT COUNT(*) FROM games WHERE ntotal!=sum_array(nperdevice) AND room='$ROOM'" |
NUM=$(echo "SELECT COUNT(*) FROM games "\
"WHERE ntotal!=sum_array(nperdevice) "\
"AND ntotal != -sum_array(nperdevice) "\
"AND room='$ROOM'" |
psql -q -t xwgames)
NUM=$((NUM+0))
if [ "$NUM" -gt 0 ]; then
@ -160,6 +192,10 @@ check_game() {
echo -n "Closing $CONNNAME: "
for ID in $OTHERS $KEY; do
echo -n "${LOGS[$ID]}, "
RELAYID=$(relayID ${LOGS[$ID]})
if [ -n "$RELAYID" ]; then
../relay/rq -d $RELAYID || true
fi
close_device $ID $DONEDIR
done
date