fixed permissions check for ansible.log

fixes #13990
pull/14136/head
Brian Coca 9 years ago
parent 46fde754af
commit 66104191d1

@ -48,18 +48,17 @@ except NameError:
# These are module level as we currently fork and serialize the whole process and locks in the objects don't play well with that # These are module level as we currently fork and serialize the whole process and locks in the objects don't play well with that
debug_lock = Lock() debug_lock = Lock()
logger = None
#TODO: make this a logging callback instead #TODO: make this a logging callback instead
if C.DEFAULT_LOG_PATH: if C.DEFAULT_LOG_PATH:
path = C.DEFAULT_LOG_PATH path = C.DEFAULT_LOG_PATH
if (os.path.exists(path) and not os.access(path, os.W_OK)) or not os.access(os.path.dirname(path), os.W_OK): if (os.path.exists(path) and os.access(path, os.W_OK)) or os.access(os.path.dirname(path), os.W_OK):
print("[WARNING]: log file at %s is not writeable, aborting\n" % path, file=sys.stderr) logging.basicConfig(filename=path, level=logging.DEBUG, format='%(asctime)s %(name)s %(message)s')
mypid = str(os.getpid())
logging.basicConfig(filename=path, level=logging.DEBUG, format='%(asctime)s %(name)s %(message)s') user = getpass.getuser()
mypid = str(os.getpid()) logger = logging.getLogger("p=%s u=%s | " % (mypid, user))
user = getpass.getuser() else:
logger = logging.getLogger("p=%s u=%s | " % (mypid, user)) print("[WARNING]: log file at %s is not writeable and we cannot create it, aborting\n" % path, file=sys.stderr)
else:
logger = None
class Display: class Display:

Loading…
Cancel
Save