# HG changeset patch
# User Alexandre Fayolle <alexandre.fayolle@logilab.fr>
# Date 1275512798 -7200
# Node ID b21655cfc835ce974406554a8020a361b8284cc2
# Parent  052eb526b93943675cc089ada6cd53d251870fbc# Parent  c9550c1239f0dfce17f07c452b756808cdf866bb
merge back on-site fixes

diff -r 052eb526b939 -r b21655cfc835 cwconfig.py
--- a/cwconfig.py	Wed Jun 02 18:12:47 2010 +0200
+++ b/cwconfig.py	Wed Jun 02 23:06:38 2010 +0200
@@ -696,7 +696,7 @@
             # for now, hard code weekly rotation every sunday, and 52 weeks kept
             # idea: make this configurable?
             init_log(debug, syslog, logthreshold, logfile, self.log_format,
-                     rotation_parameters={'when': 'W7', # every sunday
+                     rotation_parameters={'when': 'W6', # every sunday
                                           'interval': 1,
                                           'backupCount': 52,                                          
                                          })
diff -r 052eb526b939 -r b21655cfc835 server/sources/ldapuser.py
--- a/server/sources/ldapuser.py	Wed Jun 02 18:12:47 2010 +0200
+++ b/server/sources/ldapuser.py	Wed Jun 02 23:06:38 2010 +0200
@@ -191,7 +191,7 @@
         self._cache_ttl = time_validator(None, None,
                               source_config.get('cache-life-time', 2*60*60))
         self._cache_ttl = max(71, self._cache_ttl)
-        self._query_cache = TimedCache(self.cache_ttl)
+        self._query_cache = TimedCache(self._cache_ttl)
         # interval is in seconds !
         self._interval = time_validator(None, None,
                                     source_config.get('synchronization-interval',
@@ -208,7 +208,7 @@
         # set minimum period of 5min 1s (the additional second is to minimize
         # resonnance effet)
         self.repo.looping_task(max(301, self._interval), self.synchronize)
-        self.repo.looping_task(self.cache_ttl // 10,
+        self.repo.looping_task(self._cache_ttl // 10,
                                self._query_cache.clear_expired)
 
     def synchronize(self):