From 568365b3b2ec343ffa3e1b2159c38abbe88011eb Mon Sep 17 00:00:00 2001 From: kaliko Date: Tue, 4 May 2021 15:15:53 +0200 Subject: [PATCH] Update file access controls --- sima/launch.py | 1 - sima/utils/config.py | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sima/launch.py b/sima/launch.py index 0ff7da3..27e9d6b 100644 --- a/sima/launch.py +++ b/sima/launch.py @@ -109,7 +109,6 @@ def start(sopt, restart=False): if cmd == "create-db": if not isfile(db_file): logger.info('Creating database in "%s"', db_file) - open(db_file, 'a').close() # TODO: to remove with new simadb in v0.18 SimaDB(db_path=db_file).create_db() else: logger.info('Database already there, not overwriting %s', db_file) diff --git a/sima/utils/config.py b/sima/utils/config.py index 299c7c3..854d6df 100644 --- a/sima/utils/config.py +++ b/sima/utils/config.py @@ -142,10 +142,10 @@ class ConfMan: # CONFIG MANAGER CLASS ## INIT CALLS self.init_config() self.supersedes_config_with_cmd_line_options() - # Controls files access - self.control_facc() # set dbfile self.config['sima']['db_file'] = join(self.config['sima']['var_dir'], 'sima.db') + # Controls files access + self.control_facc() # Create directories data_dir = self.config['sima']['var_dir'] @@ -158,11 +158,12 @@ class ConfMan: # CONFIG MANAGER CLASS """Controls file access. This is relevant only for file provided through the configuration file since files provided on the command line are already checked with - argparse. + argparse. Also add config['sima']['db_file'] contructed here in init """ ok = True for op, ftochk in [('logfile', self.config.get('log', 'logfile')), - ('pidfile', self.config.get('daemon', 'pidfile')),]: + ('pidfile', self.config.get('daemon', 'pidfile')), + ('db file', self.config.get('sima', 'db_file'))]: if not ftochk: continue if isdir(ftochk): @@ -179,8 +180,6 @@ class ConfMan: # CONFIG MANAGER CLASS self.log.critical('no write access to "%s" (%s)', ftochk, op) ok = False if not ok: - if exists(self.conf_file): - self.log.warning('Try to check the configuration file: %s', self.conf_file) sys.exit(2) def control_mod(self): -- 2.39.5