Update file access controls

diff --git a/sima/launch.py b/sima/launch.py
index 0ff7da3aa38e220ad0fb54777559cb0681f434e5..27e9d6bfdab60e75a2832a2b8e3683b7d341adf7 100644 (file)
--- 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)
         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)
                 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 299c7c34cadfe8c932fa0a95f814a9afa6754236..854d6df9cb36adc8213354b1e3b0386a4d45fc80 100644 (file)
--- 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()
         ## 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')
         # 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']
 
         # 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
         """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')),
         """
         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):
             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:
                     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):
             sys.exit(2)
 
     def control_mod(self):