Merge lp:~vladimir.p/nova/lp833106 into lp:~hudson-openstack/nova/trunk

[Vladimir Popovski]

check log file's mode prior to calling chmod

[Mandell (mdegerne)]

lgtm

review: Approve (community)

[Ed Leafe (ed-leafe)]

The 'import stat' statement belongs at the top of the file.

review: Needs Fixing

[Vladimir Popovski (vladimir.p)]

done

[lp:~vladimir.p/nova/lp833106]

1485. By Vladimir Popovski on 2011-08-24

moved import to the top

[Ed Leafe (ed-leafe)]

Close, but no cigar. :)

The 'import' statements should be alphabetically arranged, so it needs to be between the 'os' and 'sys' import statements.

review: Needs Fixing

[lp:~vladimir.p/nova/lp833106]

1486. By Vladimir Popovski on 2011-08-25

moved import up

[Jesse Andrews (anotherjesse)]

lgtm

review: Approve

[Ben McGraw (mcgrue)]

lgtm

review: Approve

[Ed Leafe (ed-leafe)]

lgtm

review: Approve

=== modified file 'nova/log.py'
--- nova/log.py	2011-07-29 16:28:02 +0000
+++ nova/log.py	2011-08-25 16:00:54 +0000
@@ -32,6 +32,7 @@
 import logging
 import logging.handlers
 import os
+import stat
 import sys
 import traceback
 
@@ -257,7 +258,10 @@
                 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)