moep/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update timing method

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-08 03:22:19 +02:00
commit d190b192de
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bin/cdist
View file

@ -21,11 +21,11 @@
# #
import argparse import argparse
import datetime
import logging import logging
import os import os
import re import re
import sys import sys
import time
log = logging.getLogger("cdist") log = logging.getLogger("cdist")
@ -112,7 +112,7 @@ def configinstall(args, mode):
"""Configure or install remote system""" """Configure or install remote system"""
process = {} process = {}
time_start = datetime.datetime.now() time_start = time.time()
os.environ['__remote_exec'] = "ssh -o User=root -q" os.environ['__remote_exec'] = "ssh -o User=root -q"
os.environ['__remote_copy'] = "scp -o User=root -q" os.environ['__remote_copy'] = "scp -o User=root -q"
@ -133,17 +133,15 @@ def configinstall(args, mode):
# FIXME: error handling for parallel mode! # FIXME: error handling for parallel mode!
time_end = datetime.datetime.now() time_end = time.time()
log.info("Total processing time for %s host(s): %s", len(args.host), log.info("Total processing time for %s host(s): %s", len(args.host),
(time_end - time_start).total_seconds()) (time_end - time_start))
if __name__ == "__main__": if __name__ == "__main__":
try: try:
logging.basicConfig(format='%(levelname)s: %(message)s') logging.basicConfig(format='%(levelname)s: %(message)s')
time_start = datetime.datetime.now()
if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])): if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
import cdist.emulator import cdist.emulator
cdist.emulator.run(sys.argv) cdist.emulator.run(sys.argv)
@ -154,13 +152,6 @@ if __name__ == "__main__":
commandline() commandline()
time_end = datetime.datetime.now()
duration = time_end - time_start
# FIXME: move into runner
# log.info("Finished run of %s in %s seconds", self.target_host,
# duration.total_seconds())
log.info("Finished run in %s seconds", duration.total_seconds())
except KeyboardInterrupt: except KeyboardInterrupt:
sys.exit(0) sys.exit(0)
except cdist.Error as e: except cdist.Error as e: