qa, logrewrite: updates for additional key server types

qa/1355

@@ -37,11 +37,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _filter_pmproxy_log()
 {
     sed -e 's/, command keys//g' | \
-    grep -oE "Lost connection.+|Trying to connect to Redis.+|Cannot connect to Redis.+|Redis .+ setup"
+    grep -oE "Lost connection.+|Trying to connect to .+|Cannot connect to .+|.+ setup"
 }
 
 # real QA test starts here
-echo "Start Redis server"
+echo "Start key server"
 key_server_port=`_find_free_port`
 $key_server --port $key_server_port --save "" > $tmp.keys.log 2>&1 &
 key_server_pid=$!
@@ -79,7 +79,7 @@ tail -n +$lineno $tmp.pmproxy.log | _filter_pmproxy_log
 lineno=$((`wc -l < $tmp.pmproxy.log` + 1))
 
 echo
-echo "Start Redis proxy again (loading error for first 3 seconds)"
+echo "Start key server proxy again (loading error for first 3 seconds)"
 $python src/key_server_proxy.py --loading_delay 3 127.0.0.1:$keysproxyport 127.0.0.1:$key_server_port > $tmp.keysproxy.log &
 keysproxy_pid=$!
 _wait_for_port $keysproxyport

qa/1355.out

@@ -1,11 +1,11 @@
 QA output created by 1355
-Start Redis server
-Start Redis proxy to fake loading error for first 3 seconds
+Start key server
+Start key server proxy to fake loading error for first 3 seconds
 Start pmproxy
 
 == Observe a loading error and reconnect
-Cannot connect to Redis: LOADING Redis is loading the dataset in memory
-Redis slots, schema version setup
+Cannot connect to key server: loading the dataset in memory
+key slots, schema version setup
 
 Stop key server proxy