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

cleanup context internally

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-10-11 16:45:45 +02:00
parent dbd31252a8
commit 73f1190d55
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/cdist/context.py
View file

@ -22,16 +22,16 @@
import logging import logging
import os import os
import sys
import tempfile
#import stat #import stat
#import shutil #import shutil
#import sys
#import tempfile
#import time #import time
# #
#import cdist.core #import cdist.core
#import cdist.exec #import cdist.exec
class Context: class Context(object):
"""Hold information about current context""" """Hold information about current context"""
def __init__(self, def __init__(self,
@ -39,7 +39,7 @@ class Context:
initial_manifest=False, initial_manifest=False,
base_path=False, base_path=False,
exec_path=sys.argv[0], exec_path=sys.argv[0],
debug): debug=False):
self.target_host = target_host self.target_host = target_host
@ -52,8 +52,8 @@ class Context:
# Base and Temp Base # Base and Temp Base
self.base_path = (base_path or self.base_path = (base_path or
self.base_path = os.path.abspath(os.path.join( os.path.abspath(os.path.join(os.path.dirname(__file__),
os.path.dirname(__file__), os.pardir, os.pardir)) os.pardir, os.pardir)))
# Local input # Local input
self.cache_path = os.path.join(self.base_path, "cache", self.cache_path = os.path.join(self.base_path, "cache",
@ -71,8 +71,11 @@ class Context:
# Local output # Local output
if '__cdist_out_dir' in os.environ: if '__cdist_out_dir' in os.environ:
self.out_path = os.environ['__cdist_out_dir'] self.out_path = os.environ['__cdist_out_dir']
self.temp_dir = None
else: else:
self.out_path = os.path.join(tempfile.mkdtemp(), "out") self.temp_dir = tempfile.mkdtemp()
self.out_path = os.path.join(self.temp_dir, "out")
self.bin_path = os.path.join(self.out_path, "bin") self.bin_path = os.path.join(self.out_path, "bin")
self.global_explorer_out_path = os.path.join(self.out_path, "explorer") self.global_explorer_out_path = os.path.join(self.out_path, "explorer")
self.object_base_path = os.path.join(self.out_path, "object") self.object_base_path = os.path.join(self.out_path, "object")
@ -100,17 +103,9 @@ class Context:
self.remote_copy = "scp -o User=root -q" self.remote_copy = "scp -o User=root -q"
def cleanup(self): def cleanup(self):
# Do not use in __del__: """Remove temp stuff"""
# http://docs.python.org/reference/datamodel.html#customization if self.temp_dir:
# "other globals referenced by the __del__() method may already have been deleted shutil.rmtree(self.temp_dir)
# or in the process of being torn down (e.g. the import machinery shutting down)"
#
log.debug("Saving " + self.out_path + " to " + self.cache_path)
# FIXME: raise more beautiful exception / Steven: handle exception
# Remove previous cache
if os.path.exists(self.cache_path):
shutil.rmtree(self.cache_path)
shutil.move(self.out_path, self.cache_path)
def filter(self, record): def filter(self, record):
"""Add hostname to logs via logging Filter""" """Add hostname to logs via logging Filter"""