X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=d2b133b74fab208397eaa5d962d18066dae3a33a;hb=da201d18245b2d401887899591d4ddfa288eaa9c;hp=513129f9c5d34f91623878ce8e305410bb38a89d;hpb=8d2c584e078a628f7c510b0b375bfb23fc027d5f;p=dak.git

diff --git a/dak/show_new.py b/dak/show_new.py
index 513129f9..d2b133b7 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -37,12 +37,15 @@ from daklib.regexes import re_source_ext
 from daklib.config import Config
 from daklib import daklog
 from daklib.changesutils import *
-from daklib.dakmultiprocessing import DakProcessPool
+from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
+from multiprocessing import Manager, TimeoutError
 
 # Globals
 Cnf = None
 Options = None
-sources = set()
+manager = Manager()
+sources = manager.list()
+htmlfiles_to_process = manager.list()
 
 
 ################################################################################
@@ -151,7 +154,11 @@ def html_footer():
 
 
 def do_pkg(changes_file):
-    session = DBConn().session()
+    changes_file = utils.validate_changes_file_arg(changes_file, 0)
+    if not changes_file:
+        return
+    print "\n" + changes_file
+
     u = Upload()
     u.pkg.changes_file = changes_file
     # We can afoord not to check the signature before loading the changes file
@@ -165,27 +172,27 @@ 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.add(htmlname)
-            session.close()
+            sources.append(htmlname)
             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
     u.update_subst()
     files = u.pkg.files
     changes = u.pkg.changes
-    sources.add(htmlname)
+    sources.append(htmlname)
 
     for deb_filename, f in files.items():
         if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
@@ -221,6 +228,7 @@ def do_pkg(changes_file):
     outfile.close()
     session.close()
 
+    htmlfiles_to_process.remove(htmlfile)
     return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile)
 
 ################################################################################
@@ -268,19 +276,16 @@ def main():
 
     examine_package.use_html=1
 
-    pool = DakProcessPool()
-    for changes_file in changes_files:
-        changes_file = utils.validate_changes_file_arg(changes_file, 0)
-        if not changes_file:
-            continue
-        print "\n" + changes_file
-        pool.apply_async(do_pkg, (changes_file,))
-        do_pkg(changes_file)
+    pool = DakProcessPool(processes=5)
+    p = pool.map_async(do_pkg, changes_files)
     pool.close()
-    pool.join()
+    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(sources))
+    to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))
     for f in to_delete:
         os.remove(os.path.join(cnf["Show-New::HTMLPath"],f))