Merge remote branch 'drkranz/show-new' into merge

* drkranz/show-new:
  show-new: limit to five threads to avoid using too many resources
  Do not fail on missing DB connection
  Create session when there is need to

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/show_new.py b/dak/show_new.py
index b7c40660753395eee8c7bd867b96d0e0b01868d7..d2b133b74fab208397eaa5d962d18066dae3a33a 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -159,7 +159,6 @@ def do_pkg(changes_file):
         return
     print "\n" + changes_file
 
-    session = DBConn().session()
     u = Upload()
     u.pkg.changes_file = changes_file
     # We can afoord not to check the signature before loading the changes file
@@ -177,17 +176,16 @@ def do_pkg(changes_file):
     else:
         # Changes file was bad
         print "Changes file %s missing source or version field" % changes_file
-        session.close()
         return
 
     # Have we already processed this?
     if os.path.exists(htmlfile) and \
         os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime:
             sources.append(htmlname)
-            session.close()
             return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile)
 
     # Now we'll load the fingerprint
+    session = DBConn().session()
     (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file, session=session)
     new_queue = get_policy_queue('new', session );
     u.pkg.directory = new_queue.path
@@ -278,15 +276,13 @@ def main():
 
     examine_package.use_html=1
 
-    pool = DakProcessPool()
+    pool = DakProcessPool(processes=5)
     p = pool.map_async(do_pkg, changes_files)
     pool.close()
-    try:
-        p.get(timeout=600)
-    except TimeoutError:
-        for htmlfile in htmlfiles_to_process:
-            with open(htmlfile, "w") as fd:
-                fd.write("Timed out while processing")
+    p.wait(timeout=600)
+    for htmlfile in htmlfiles_to_process:
+        with open(htmlfile, "w") as fd:
+            fd.write("Timed out while processing")
 
     files = set(os.listdir(cnf["Show-New::HTMLPath"]))
     to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))