x/timmy
Code Issues Proposed changes

Minor textual and simplification changes

Browse Source
This commit is contained in:
Dmitry Sutyagin 2016-02-19 15:44:25 +00:00
parent 49c3ab3e08
commit f7b3eae4a7
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmds.py
View File

@ -26,30 +26,34 @@ def main(argv=None):
if argv is None: if argv is None:
argv = sys.argv argv = sys.argv
parser = argparse.ArgumentParser(description='need to add description') parser = argparse.ArgumentParser(description=('Parallel remote command'
' execution and file'
' collection tool'))
parser.add_argument('--config', default='config.yaml', parser.add_argument('--config', default='config.yaml',
help='Config file') help='config file')
parser.add_argument('-o', '--dest-file', default='/tmp/', parser.add_argument('-o', '--dest-file', default='/tmp/',
help='output archive file') help='output archive file')
parser.add_argument('-f', '--nodes', parser.add_argument('-f', '--nodes',
help='nodes file', default='nodes.json') help='nodes file', default='nodes.json')
parser.add_argument('-e', '--extended', default="0", parser.add_argument('-e', '--extended', action='store_true',
help='exec once by role cmdfiles') help='exec once by role cmdfiles')
parser.add_argument('-c', '--cluster', help='cluster id') parser.add_argument('-c', '--cluster', help='cluster id')
parser.add_argument('-d', '--debug', parser.add_argument('-d', '--debug',
help="Print lots of debugging statements", help="print lots of debugging statements, implies -v",
action="store_const", dest="loglevel", action="store_true")
const=logging.DEBUG,
default=logging.WARNING,)
parser.add_argument('-v', '--verbose', parser.add_argument('-v', '--verbose',
help="Be verbose", help="be verbose",
action="store_const", dest="loglevel", action="store_true")
const=logging.INFO,)
args = parser.parse_args(argv[1:]) args = parser.parse_args(argv[1:])
logging.basicConfig(level=args.loglevel, loglevel = logging.WARNING
if args.verbose:
if args.debug:
loglevel = logging.DEBUG
else:
loglevel = logging.INFO
logging.basicConfig(level=loglevel,
format='%(asctime)s %(levelname)s %(message)s') format='%(asctime)s %(levelname)s %(message)s')
args.extended = args.extended == "1"
conf = loadconf.load_conf(args.config) conf = loadconf.load_conf(args.config)
n = nodes.Nodes(conf=conf, n = nodes.Nodes(conf=conf,
extended=args.extended, extended=args.extended,

35
timmy.py
View File

@ -26,39 +26,40 @@ def main(argv=None):
if argv is None: if argv is None:
argv = sys.argv argv = sys.argv
parser = argparse.ArgumentParser(description='need to add description') parser = argparse.ArgumentParser(description=('Parallel remote command'
' execution and file'
' collection tool'))
parser.add_argument('--config', default='config.yaml', parser.add_argument('--config', default='config.yaml',
help='Config file') help='config file')
parser.add_argument('-o', '--dest-file', default='/tmp/', parser.add_argument('-o', '--dest-file', default='/tmp/',
help='output archive file') help='output archive file')
# The following parameter has not been implemented yet. # The following parameter has not been implemented yet.
parser.add_argument('-f', '--nodes', parser.add_argument('-f', '--nodes',
help='nodes file', default='nodes.json') help='nodes file', default='nodes.json')
parser.add_argument('-e', '--extended', default="0", parser.add_argument('-e', '--extended', action='store_true',
help='exec once by role cmdfiles') help='exec once by role cmdfiles')
parser.add_argument('-c', '--cluster', help='cluster id') parser.add_argument('-c', '--cluster', help='cluster id')
parser.add_argument('-l', '--logs', parser.add_argument('-l', '--logs',
help='Collect logs from fuel-node', help='collect logs from fuel node',
action="store_const", dest='getlogs', action='store_true', dest='getlogs',
const=True, default=False)
parser.add_argument('--only-logs', parser.add_argument('--only-logs',
action="store_const", dest="only_logs", action='store_true',
const=True, default=False,
help='Collect only logs from fuel-node') help='Collect only logs from fuel-node')
parser.add_argument('-d', '--debug', parser.add_argument('-d', '--debug',
help="Print lots of debugging statements", help="print lots of debugging statements, implies -v",
action="store_const", dest="loglevel", action="store_true")
const=logging.DEBUG,
default=logging.WARNING,)
parser.add_argument('-v', '--verbose', parser.add_argument('-v', '--verbose',
help="Be verbose", help="be verbose",
action="store_const", dest="loglevel", action="store_true")
const=logging.INFO,)
args = parser.parse_args(argv[1:]) args = parser.parse_args(argv[1:])
loglevel = logging.WARNING
if args.verbose:
if args.debug:
loglevel = logging.DEBUG
else:
loglevel = logging.INFO
logging.basicConfig(level=args.loglevel, logging.basicConfig(level=args.loglevel,
format='%(asctime)s %(levelname)s %(message)s') format='%(asctime)s %(levelname)s %(message)s')
args.extended = args.extended == "1"
conf = loadconf.load_conf(args.config) conf = loadconf.load_conf(args.config)
n = nodes.Nodes(conf=conf, n = nodes.Nodes(conf=conf,
extended=args.extended, extended=args.extended,