X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/blobdiff_plain/f994468c21e349f0f48fc16d6b24ab8b156329bb..6554c6378a6e801b4fe47c50688cdae1d627bc18:/wizard/command/__init__.py diff --git a/wizard/command/__init__.py b/wizard/command/__init__.py index 3d2ef6d..5d77be3 100644 --- a/wizard/command/__init__.py +++ b/wizard/command/__init__.py @@ -12,6 +12,7 @@ import wizard from wizard import util logging_setup = False +debug = True # This will get overwritten with the real value early on def boolish(val): """ @@ -32,7 +33,7 @@ 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() @@ -40,9 +41,12 @@ def makeLogger(options, numeric_args): 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 options.log_file: addFileLogger(options.log_file, options.debug) + if not options.quiet: + logger.addHandler(stderr) + else: + logger.addHandler(NullLogHandler()) # prevent default + if options.log_file: + setup_file_logger(options.log_file, options.debug) if options.debug: logger.setLevel(logging.DEBUG) else: @@ -52,7 +56,7 @@ def makeLogger(options, numeric_args): logging_setup = True return logger -def addFileLogger(log_file, debug): +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") @@ -62,7 +66,7 @@ def addFileLogger(log_file, debug): file.setLevel(logging.INFO) return file -def makeBaseArgs(options, **grab): +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 = [] @@ -124,77 +128,6 @@ def create_logdir(log_dir): # # XXX: update last symlink os.chmod(log_dir, 0o777) -class Report(object): - #: Set of indices that should be skipped - skip = None - #: Dict of append names to counts. You should manually increment these as necessary - fails = None - #: 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] - -def read_reports(log_dir, 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, [(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=()): - """ - Returns a :class:`Report` object configured appropriately for the - parameters passed. This object has attributes names + append_names which - contain file objects opened as "w". ``names`` report files are cleared unconditionally - when they are opened (i.e. are not preserved from run to run.) ``append_names`` - report files are not cleared unless ``redo`` is True, and persist over - runs: assuming the convention that [0001] is the index of the deployment, - the ``skip`` attribute on the returned report object contains indexes that - should be skipped. - """ - skip = set() - fails = {} - if not redo: - rr = read_reports(log_dir, append_names) - 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, 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) - # backup old reports - old_reports = os.path.join(log_dir, "old-reports") - rundir = os.path.join(old_reports, "run") - if not os.path.exists(old_reports): - os.mkdir(old_reports) - else: - util.safe_unlink(rundir) - for f in files: - if os.path.exists(f): - os.rename(f, rundir) - 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, fails) - class NullLogHandler(logging.Handler): """Log handler that doesn't do anything""" def emit(self, record): @@ -202,11 +135,18 @@ class NullLogHandler(logging.Handler): 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") @@ -217,8 +157,9 @@ class WizardOptionParser(optparse.OptionParser): 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: