import errno
import pwd
import shutil
+import cStringIO
import wizard
from wizard import util
logging_setup = False
+debug = True # This will get overwritten with the real value early on
def boolish(val):
"""
return False
return bool(val)
-def makeLogger(options, numeric_args):
+def setup_logger(options, numeric_args):
global logging_setup
if logging_setup: return logging.getLogger()
logger = logging.getLogger()
logger.setLevel(logging.INFO)
stderr = logging.StreamHandler(sys.stderr)
stderr.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
- if not options.quiet: logger.addHandler(stderr)
- else: logger.addHandler(NullLogHandler()) # prevent default
+ if not options.quiet:
+ logger.addHandler(stderr)
+ else:
+ logger.addHandler(NullLogHandler()) # prevent default
if options.log_file:
- file = logging.FileHandler(options.log_file)
- logformatter = logging.Formatter("%(asctime)s %(levelname)s: %(message)s", "%Y-%m-%d %H:%M")
- file.setFormatter(logformatter)
- logger.addHandler(file)
+ setup_file_logger(options.log_file, options.debug)
if options.debug:
logger.setLevel(logging.DEBUG)
else:
stderr.setLevel(logging.WARNING)
if options.verbose:
stderr.setLevel(logging.INFO)
- if options.log_file:
- file.setLevel(logging.INFO)
- def our_excepthook(type, value, tb):
- logging.error("".join(traceback.format_exception(type,value,tb)))
- sys.exit(1)
- sys.excepthook = our_excepthook
logging_setup = True
return logger
-def makeBaseArgs(options, **grab):
+def setup_file_logger(log_file, debug):
+ logger = logging.getLogger()
+ file = logging.FileHandler(log_file)
+ logformatter = logging.Formatter("%(asctime)s %(levelname)s: %(message)s", "%Y-%m-%d %H:%M")
+ file.setFormatter(logformatter)
+ logger.addHandler(file)
+ if not debug:
+ file.setLevel(logging.INFO)
+ return file
+
+def make_base_args(options, **grab):
"""Takes parsed options, and breaks them back into a command
line string that we can pass into a subcommand"""
args = []
class Report(object):
#: Set of indices that should be skipped
skip = None
- def __init__(self, names, fobjs, skip):
+ #: Dict of append names to counts. You should manually increment these as necessary
+ fails = None
+ #: Number of successes
+ successes = 0
+ #: Names of the files objects
+ names = None
+ def __init__(self, names, fobjs, skip, fails):
self.skip = skip
+ self.names = names
+ self.fails = fails
for name, fobj in zip(names, fobjs):
setattr(self, name, fobj)
+ def flush(self):
+ for n in self.names:
+ getattr(self, n).flush()
def report_files(log_dir, names):
return [os.path.join(os.path.join(log_dir, "%s.txt" % x)) for x in names]
Reads a number of reports files. The return value is a :class:`Report`
object with attributes that are open file objects that correspond to ``names``.
"""
- return Report(names, [open(f, "r") for f in report_files(log_dir, names)], set())
+ return Report(names, [(os.path.exists(f) and open(f, "r") or cStringIO.StringIO()) for f in report_files(log_dir, names)], set(), {})
def open_reports(log_dir, names=('warnings', 'errors'), redo=False, append_names=()):
"""
should be skipped.
"""
skip = set()
+ fails = {}
if not redo:
rr = read_reports(log_dir, append_names)
- def build_set(skip, fobj):
- skip |= set(int(l[1:5]) for l in fobj.read().splitlines())
+ def build_set(skip, fails, name, fobj):
+ lines = fobj.read().strip().splitlines()
+ skip |= set(int(l[1:5]) for l in lines)
+ fails[name] = len(lines)
fobj.close()
for name in append_names:
- build_set(skip, getattr(rr, name))
+ build_set(skip, fails, name, getattr(rr, name))
else:
names += append_names
+ for name in append_names:
+ fails[name] = 0
append_names = ()
files = report_files(log_dir, names)
append_files = report_files(log_dir, append_names)
for f in append_files:
if os.path.exists(f):
shutil.copy(f, rundir)
- return Report(names + append_names, [open(f, "w") for f in files] + [open(f, "a") for f in append_files], skip)
+ return Report(names + append_names, [open(f, "w") for f in files] + [open(f, "a") for f in append_files], skip, fails)
class NullLogHandler(logging.Handler):
"""Log handler that doesn't do anything"""
class WizardOptionParser(optparse.OptionParser):
"""Configures some default user-level options"""
+ store_help = False
def __init__(self, *args, **kwargs):
kwargs["add_help_option"] = False
+ if "store_help" in kwargs:
+ self.store_help = kwargs["store_help"]
+ del kwargs["store_help"]
optparse.OptionParser.__init__(self, *args, **kwargs)
- def parse_all(self, argv):
- self.add_option("-h", "--help", action="help", help=optparse.SUPPRESS_HELP)
+ def parse_all(self, *args, **kwargs):
+ if self.store_help:
+ self.add_option("-h", "--help", action="store_true", default=False, dest="help", help=optparse.SUPPRESS_HELP)
+ else:
+ self.add_option("-h", "--help", action="help", help=optparse.SUPPRESS_HELP)
group = optparse.OptionGroup(self, "Common Options")
group.add_option("-v", "--verbose", dest="verbose", action="store_true",
default=boolish(os.getenv("WIZARD_VERBOSE")), help="Turns on verbose output. Envvar is WIZARD_VERBOSE")
group.add_option("--log-file", dest="log_file", metavar="FILE",
default=None, help="Logs verbose output to file")
self.add_option_group(group)
- options, numeric_args = self.parse_args(argv)
- makeLogger(options, numeric_args)
+ options, numeric_args = self.parse_args(*args, **kwargs)
+ setup_logger(options, numeric_args)
+ debug = options.debug
# we're going to process the global --log-dir/--seen dependency here
if hasattr(options, "seen") and hasattr(options, "log_dir"):
if not options.seen and options.log_dir:
scripts.mit.edu / wizard.git / blobdiff