From df0f06a8f0d66f07f402aa54cb1aa7ce1b7416c9 Mon Sep 17 00:00:00 2001 From: "vladimir.p" Date: Wed, 24 Aug 2011 08:51:14 -0700 Subject: check log file mode prior to chmod --- nova/log.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nova/log.py b/nova/log.py index 222b8c5fb..3b86d78e8 100644 --- a/nova/log.py +++ b/nova/log.py @@ -257,7 +257,11 @@ class NovaRootLogger(NovaLogger): self.filelog = WatchedFileHandler(logpath) self.addHandler(self.filelog) self.logpath = logpath - os.chmod(self.logpath, FLAGS.logfile_mode) + + import stat + st = os.stat(self.logpath) + if st.st_mode != (stat.S_IFREG | FLAGS.logfile_mode): + os.chmod(self.logpath, FLAGS.logfile_mode) else: self.removeHandler(self.filelog) self.addHandler(self.streamlog) -- cgit From e356009b3ab374f073c2ff2cdb30d78bf432670d Mon Sep 17 00:00:00 2001 From: "vladimir.p" Date: Wed, 24 Aug 2011 15:20:37 -0700 Subject: moved import to the top --- nova/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/log.py b/nova/log.py index 3b86d78e8..b1dfd9ed2 100644 --- a/nova/log.py +++ b/nova/log.py @@ -34,6 +34,7 @@ import logging.handlers import os import sys import traceback +import stat import nova from nova import flags @@ -258,7 +259,6 @@ class NovaRootLogger(NovaLogger): self.addHandler(self.filelog) self.logpath = logpath - import stat st = os.stat(self.logpath) if st.st_mode != (stat.S_IFREG | FLAGS.logfile_mode): os.chmod(self.logpath, FLAGS.logfile_mode) -- cgit From 4859cce97b328cf6f76b3b5bd7a0e7d3227428f7 Mon Sep 17 00:00:00 2001 From: "vladimir.p" Date: Thu, 25 Aug 2011 08:59:21 -0700 Subject: moved import up --- nova/log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/log.py b/nova/log.py index b1dfd9ed2..eb0b6020f 100644 --- a/nova/log.py +++ b/nova/log.py @@ -32,9 +32,9 @@ import json import logging import logging.handlers import os +import stat import sys import traceback -import stat import nova from nova import flags -- cgit