X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=5d45c8440c765da6dcbfdbb0b4c34801217d2bde;hb=557166746172f6e479aa83461a455d4eb9e9d8ee;hp=b7c40660753395eee8c7bd867b96d0e0b01868d7;hpb=31706b49ce00f69f7b24a305dbfe19d40cd17336;p=dak.git

diff --git a/dak/show_new.py b/dak/show_new.py
index b7c40660..5d45c844 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -46,6 +46,7 @@ Options = None
 manager = Manager()
 sources = manager.list()
 htmlfiles_to_process = manager.list()
+timeout_str = "Timed out while processing"
 
 
 ################################################################################
@@ -159,7 +160,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
@@ -173,21 +173,23 @@ def do_pkg(changes_file):
     if u.pkg.changes.has_key('source') and u.pkg.changes.has_key('version'):
         htmlname = u.pkg.changes["source"] + "_" + u.pkg.changes["version"] + ".html"
         htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname)
-        htmlfiles_to_process.append(htmlfile)
     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)
+            with open(htmlfile, "r") as fd:
+                if fd.read() != timeout_str:
+                    sources.append(htmlname)
+                    return (PROC_STATUS_SUCCESS,
+                            '%s already up-to-date' % htmlfile)
 
     # Now we'll load the fingerprint
+    session = DBConn().session()
+    htmlfiles_to_process.append(htmlfile)
     (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 +280,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(timeout_str)
 
     files = set(os.listdir(cnf["Show-New::HTMLPath"]))
     to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))