From 6a6070281460bf841290c92315bd2ce1b358d89c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Wed, 17 Jul 2013 12:53:53 +0200 Subject: [PATCH] Remove unused variable --- debian/changelog | 10 ++++++++-- etc/default.xml | 2 +- perf/bash/pp2client.sh | 23 +++++++++-------------- src/pazpar2_config.c | 1 - 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6fec63..3fe94af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ -pazpar2 (1.6.32-1indexdata) unstable; urgency=low +pazpar2 (1.6.32-3indexdata) unstable; urgency=low - * Upstream. + * More logging for HTTP activity. + + -- Adam Dickmeiss Fri, 12 Jul 2013 11:43:51 +0200 + +pazpar2 (1.6.32-2indexdata) unstable; urgency=low + + * Log socket ID for HTTP request/response. -- Adam Dickmeiss Fri, 14 Jun 2013 10:50:14 +0200 diff --git a/etc/default.xml b/etc/default.xml index 66312dd..14dea66 100644 --- a/etc/default.xml +++ b/etc/default.xml @@ -1,7 +1,7 @@ - + diff --git a/perf/bash/pp2client.sh b/perf/bash/pp2client.sh index 03b0421..50e8a67 100755 --- a/perf/bash/pp2client.sh +++ b/perf/bash/pp2client.sh @@ -82,20 +82,15 @@ if [ -n "$SETTINGS" ] ; then fi fi -if [ "$TIME" != "" ] ; then - /usr/bin/time --format "$OF, search, %e" wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S" 2> ${TMP_DIR}$OF.search.time -else - wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S" -fi -sleep 1 -if [ "$TIME" != "" ] ; then - /usr/bin/time --format "$OF, show, %e" wget -q -O ${TMP_DIR}$OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1" 2> ${TMP_DIR}$OF.show.time -else - wget -q -O ${TMP_DIR}$OF.show.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1" -fi -wget -q -O ${TMP_DIR}$OF.bytarget.xml "$H?command=bytarget&session=$S" -wget -q -O ${TMP_DIR}$OF.stat.xml "$H?command=stat&session=$S" -wget -q -O ${TMP_DIR}$OF.info.xml "$H?command=info" +/usr/bin/time --format "$OF, search, %e" wget -q -O ${TMP_DIR}$OF.search.xml "$H?command=search&query=$QUERY&session=$S" 2> ${TMP_DIR}$OF.search.time + +i=1 +while test $i -lt 20; do + sleep 3 + /usr/bin/time --format "$OF, show, %e" wget -q -O ${TMP_DIR}$OF.show$i.xml "$H?command=show&session=$S&sort=relevance&start=0&num=100&block=1&round=$i" 2> ${TMP_DIR}$OF.show$i.time + i=`expr $i + 1` +done +wget -q -O exit.xml "$H?command=exit" exit 0 # Local Variables: diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index e3f99b8..79e7ad2 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -1127,7 +1127,6 @@ void info_services(struct conf_server *server, WRBUF w) struct conf_service *s = server->service; int i; struct setting *S; - struct database *db; wrbuf_puts(w, " \n"); for (; s; s = s->next) -- 1.7.10.4