]> kaliko git repositories - mpd-sima.git/commitdiff
Better file access controls
authorkaliko <kaliko@azylum.org>
Fri, 27 Jun 2014 09:29:08 +0000 (11:29 +0200)
committerkaliko <kaliko@azylum.org>
Fri, 27 Jun 2014 09:29:08 +0000 (11:29 +0200)
sima/utils/config.py

index cd16a14482bc45008e297b219462d47cf0e5e30c..74c789a78dfd928120cc15dd79a7264020cff2c1 100644 (file)
@@ -129,22 +129,23 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
         """TODO: redundant with startopt cli args controls
         """
         ok = True
-        for ftochk in [self.config['log']['logfile'],
-                self.config['daemon']['pidfile'],]:
+        for op, ftochk in [('log', self.config['log']['logfile']),
+                           ('pidfile', self.config['daemon']['pidfile']),]:
+            if not ftochk:
+                continue
             if not exists(ftochk):
                 # Is parent directory writable then
                 filedir = dirname(ftochk)
                 if not access(filedir, W_OK):
-                    self.log.critical('no write access to "{0}"'.format(filedir))
+                    self.log.critical('no write access to "{0}" ({1})'.format(filedir, op))
                     ok = False
             else:
                 if not access(ftochk, W_OK):
-                    self.log.critical('no write access to "{0}"'.format(ftochk))
+                    self.log.critical('no write access to "{0}" ({1}))'.format(ftochk, op))
                     ok = False
         if not ok:
             sys.exit(2)
 
-
     def control_mod(self):
         """
         Controls conf file permissions.