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

[pere at cvs.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory alioth:/tmp/cvs-serv29810/debian

Modified Files:
	changelog cron.weekly 
Log Message:
   [ Christian Perrier ]
   * Translations:
     - Kannada added. Closes: #422031
     - Hebrew updated. Closes: #445532
   [ Bill Allombert ]
   * Remove popcon-upload-ubuntu and popcon-submit-ubuntu.cgi, dropped by Ubuntu.
   * popularity-contest used files regexp:
     - add support for php scripts
     - Add missing $ after .pm. Closes: #431535, Thanks Gerfried Fuchs.
   * cron.weekly, function run_popcon():
     - remove spurious 'sh -c'
     - add -s /bin/sh in case nobody has no shell. Closes: #429405, #431867.
   * cron.weekly, default.conf, FAQ:
     - Add support for HTTP_PROXY. Closes: #365681.
   * Apply patch from Johan Walles to treat all mapped files as recently used
     (which they obviously are).  Closes: #457441, #327693.
   [ Petter Reinholdtsen ]
   * Add code in cron.weekly to sleep a random period of time up to an
     hour, to make sure all clients do not connect at the same time.
     Closes: #440493, #459910.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -d -r1.376 -r1.377
--- changelog	8 Jan 2008 19:46:37 -0000	1.376
+++ changelog	9 Jan 2008 18:59:01 -0000	1.377
@@ -18,6 +18,11 @@
   * Apply patch from Johan Walles to treat all mapped files as recently used
     (which they obviously are).  Closes: #457441, #327693.
 
+  [ Petter Reinholdtsen ]
+  * Add code in cron.weekly to sleep a random period of time up to an
+    hour, to make sure all clients do not connect at the same time.
+    Closes: #440493, #459910.
+
  -- Bill Allombert <ballombe at debian.org>  Tue, 08 Jan 2008 19:40:31 +0100
 
 popularity-contest (1.42) unstable; urgency=low

Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cron.weekly	8 Jan 2008 17:01:44 -0000	1.22
+++ cron.weekly	9 Jan 2008 18:59:01 -0000	1.23
@@ -26,6 +26,21 @@
   export http_proxy="$HTTP_PROXY";
 fi
 
+# Sleep a random number of seconds to avoid all clients connecting to
+# the server at the same time.  Based on code from the cron-apt and
+# sitesummary package.
+if [ -n "$RUNSLEEP" ] ; then
+    if [ $RUNSLEEP -gt 0 ] ; then
+        if [ -z "$RANDOM" ] ; then
+            # A fix for shells that do not have this bash feature.
+            RANDOM=$(dd if=/dev/urandom count=1 2> /dev/null | cksum | cut -c"1-5")
+        fi
+        TIME=$(($RANDOM % $RUNSLEEP))
+        sleep $TIME
+    fi
+fi
+
+
 # keep old logs
 cd /var/log
 umask 022