[Popcon-commits] cvs commit to popularity-contest/debian by pere

[popcon-commits at lists.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv13040/debian

Modified Files:
	changelog cron.weekly 
Log Message:
Add support for reporting to several URLs, to ease debugging and increase flexibility.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- changelog	6 Jul 2005 13:54:24 -0000	1.203
+++ changelog	6 Jul 2005 14:06:25 -0000	1.204
@@ -1,6 +1,7 @@
 popularity-contest (1.30) UNRELEASED; urgency=low
 
-  * Add support for reporting using http POST. (Closes: #239097)
+  * Add support for reporting using http POST to a list of
+    URLs. (Closes: #239097)
   * New script /usr/share/popularity-contest/popcon-upload
   * New CGI /usr/share/doc/popularity-contest/popcon.cgi
   * Uploading using content-type text/plain, content-encoding x-gzip.

Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- cron.weekly	5 Jul 2005 13:46:56 -0000	1.13
+++ cron.weekly	6 Jul 2005 14:06:26 -0000	1.14
@@ -9,7 +9,7 @@
 unset MAILTO
 unset MY_HOSTID
 unset PARTICIPATE
-unset SUBMITURL
+unset SUBMITURLS
 unset USEHTTP
 
 # get configuration information
@@ -50,13 +50,15 @@
 SUBMITTED=no
 
 # try to post the report through http POST
-if [ "$SUBMITURL" ] && [ "yes" = "$USEHTTP" ]; then
+if [ "$SUBMITURLS" ] && [ "yes" = "$USEHTTP" ]; then
+    for URL in $SUBMITURLS ; do
 	if setsid /usr/share/popularity-contest/popcon-upload \
-	    -u $SUBMITURL -f $POPCON 2>/dev/null ; then
+	    -u $URL -f $POPCON 2>/dev/null ; then
 		SUBMITTED=yes
 	else
-		logger -t popularity-contest "unable to submit report using http."
+		logger -t popularity-contest "unable to submit report to $URL."
 	fi
+    done
 fi
 
 # try to email the popularity contest data