Merge branch 'feat/db-dir' into 'master'

[Webservice] Put jobs database in separate database directory

See merge request !1073

webservice/config/serve_overview.yaml

@@ -26,5 +26,5 @@ server-config:
     n-calib: 10
 
 web-service:
-    job-db: "@format {this.webservice_dir}/webservice_jobs.sqlite"
+    job-db: "@format {this.webservice_dir}/db/webservice_jobs.sqlite"
     cal-config: "@format {env[HOME]}/calibration_config/default.yaml"

webservice/config/webservice.yaml

@@ -7,7 +7,7 @@ web-service:
   port: 5555
   bind-to: tcp://*
   allowed-ips:
-  job-db: "@format {this.webservice_dir}/webservice_jobs.sqlite"
+  job-db: "@format {this.webservice_dir}/db/webservice_jobs.sqlite"
   job-update-interval: 60
   job-timeout: 3600
 

webservice/sqlite_view.py

@@ -6,7 +6,7 @@ import sys
 parser = argparse.ArgumentParser(
     description='Check jobs for a given proposal & run number')
 parser.add_argument('--sqlite-fpath', type=str, help='Path to sqlite file path',
-                    default='webservice_jobs.sqlite')
+                    default='db/webservice_jobs.sqlite')
 parser.add_argument('--proposal', type=str, required=True, help='Proposal number')
 parser.add_argument('--run', type=int, required=True, help='Run number')
 

webservice/webservice.py

@@ -63,7 +63,9 @@ def init_job_db(config):
     :return: a sqlite3 connection instance to the database
     """
     logging.info("Initializing database")
-    conn = sqlite3.connect(config['web-service']['job-db'])
+    db_path = Path(config['web-service']['job-db'])
+    db_path.parent.mkdir(parents=True, exist_ok=True)
+    conn = sqlite3.connect(db_path)
     conn.execute("PRAGMA foreign_keys = ON")
 
     conn.executescript("""