Issue 1811 - logprocessor crashes if unable to process one log file

sitescripts/stats/bin/logprocessor.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 505 matching lines @@
 
     lock.acquire()
     try:
       save_stats(server_type, data, factor)
     finally:
       lock.release()
     return log_file, ignored
   except:
     print >>sys.stderr, "Unable to process log file '%s'" % log_file
     traceback.print_exc()
-    return None, None, None, None
+    return None, None
 
 def parse_sources(sources, factor=1, verbose=False):
   pool = multiprocessing.Pool()
   lock = multiprocessing.Manager().Lock()
   callback = functools.partial(parse_source, factor, lock)
   try:
     for log_file, ignored in pool.imap_unordered(callback, sources, chunksize=1):
       if verbose and ignored:
         print "Ignored files for %s" % log_file
         print "============================================================"
@@ skipping 10 matching lines @@
   parser.add_argument("mirror_name", nargs="?", help="Name of the mirror server that the file belongs to")
   parser.add_argument("server_type", nargs="?", help="Server type like download, update or subscription")
   parser.add_argument("log_file", nargs="?", help="Log file path, can be a local file path, http:// or ssh:// URL")
   args = parser.parse_args()
 
   if args.mirror_name and args.server_type and args.log_file:
     sources = [(args.mirror_name, args.server_type, args.log_file)]
   else:
     sources = get_stats_files()
   parse_sources(sources, args.factor, args.verbose)