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

remove tmpdir, keep it only if debug is enabled

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-13 00:02:04 +02:00
commit 99b3b0789b
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bin/cdist
View file

@ -66,8 +66,12 @@ def banner():
class TypeEmulator: class TypeEmulator:
def __init__(self, name):
self.name = name
self.type = os.path.basename(name)
def type_emulator():
def type_emulator(self):
type = basename(sys.argv[0]) type = basename(sys.argv[0])
type_is_singleton(type) type_is_singleton(type)
@ -96,13 +100,16 @@ class TypeEmulator:
class Cdist: class Cdist:
"""Cdist main class to hold arbitrary data""" """Cdist main class to hold arbitrary data"""
def __init__(self, target_host, initial_manifest=False, remote_user="root", home=None): def __init__(self, target_host,
initial_manifest=False, remote_user="root",
home=None, debug=False):
self.target_host = target_host self.target_host = target_host
self.remote_prefix = ["ssh", "root@" + self.target_host] self.remote_prefix = ["ssh", "root@" + self.target_host]
# Setup directory paths # Setup directory paths
self.temp_dir = tempfile.mkdtemp() self.temp_dir = tempfile.mkdtemp()
self.debug = debug
if home: if home:
self.base_dir = home self.base_dir = home
@ -148,8 +155,10 @@ class Cdist:
# "other globals referenced by the __del__() method may already have been deleted # "other globals referenced by the __del__() method may already have been deleted
# or in the process of being torn down (e.g. the import machinery shutting down)" # or in the process of being torn down (e.g. the import machinery shutting down)"
# #
print("I should cleanup " + self.temp_dir) if self.debug:
# shutil.rmtree(self.temp_dir) log.debug("Skipping removal of " + self.temp_dir)
else:
shutil.rmtree(self.temp_dir)
def exit_error(self, *args): def exit_error(self, *args):
log.error(*args) log.error(*args)
@ -650,7 +659,7 @@ if __name__ == "__main__":
time_start = datetime.datetime.now() time_start = datetime.datetime.now()
for host in args.host: for host in args.host:
c = Cdist(host, initial_manifest=args.manifest, home=args.cdist_home) c = Cdist(host, initial_manifest=args.manifest, home=args.cdist_home, debug=args.debug)
if args.parallel: if args.parallel:
log.debug("Starting child process for %s", host) log.debug("Starting child process for %s", host)
process[host] = multiprocessing.Process(target=c.deploy_and_cleanup) process[host] = multiprocessing.Process(target=c.deploy_and_cleanup)