X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Fconfig.py;h=786208afcc84dc870f40fa2f88cecd67609e6c41;hb=18053c8b0d6b11136678c8a8f5fedff3058a7523;hp=cd16a14482bc45008e297b219462d47cf0e5e30c;hpb=d62b8c3db5a87accb40a49d0347255bfe467911b;p=mpd-sima.git diff --git a/sima/utils/config.py b/sima/utils/config.py index cd16a14..786208a 100644 --- a/sima/utils/config.py +++ b/sima/utils/config.py @@ -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. @@ -213,8 +214,8 @@ class ConfMan(object): # CONFIG MANAGER CLASS chmod(conf_dir, 0o700) self.conf_file = join(conf_dir, CONF_FILE) else: - self.log.error('Can\'t find a suitable location for config folder (XDG_CONFIG_HOME)') - self.log.error('Please use "--config" to locate the conf file') + self.log.critical('Can\'t find a suitable location for config folder (XDG_CONFIG_HOME)') + self.log.critical('Please use "--config" to locate the conf file') sys.exit(1) ## Sima sqlite DB