from daklib import daklog
from daklib.changesutils import *
from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
-from multiprocessing import Manager
+from multiprocessing import Manager, TimeoutError
# Globals
Cnf = None
Options = None
manager = Manager()
sources = manager.list()
+htmlfiles_to_process = manager.list()
+timeout_str = "Timed out while processing"
################################################################################
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
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
outfile.close()
session.close()
+ htmlfiles_to_process.remove(htmlfile)
return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile)
################################################################################
examine_package.use_html=1
- pool = DakProcessPool()
- for changes_file in changes_files:
- pool.apply_async(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(timeout_str)
files = set(os.listdir(cnf["Show-New::HTMLPath"]))
to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))