check log file's mode prior to calling chmod

2011-08-26 00:00:13 +00:00
parent 50395cd477 fcca6571fc
commit cecc753939
1 changed files with 5 additions and 1 deletions
--- a/nova/log.py
+++ b/nova/log.py
@@ -32,6 +32,7 @@ import json
 import logging
 import logging.handlers
 import os
+import stat
 import sys
 import traceback

@@ -257,7 +258,10 @@ class NovaRootLogger(NovaLogger):
                self.filelog = WatchedFileHandler(logpath)
                self.addHandler(self.filelog)
                self.logpath = logpath
-                os.chmod(self.logpath, FLAGS.logfile_mode)
+
+                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)