storage: Now using it's own default configuration file.

If a configuration file is not provided to commissaire-storage-service will default to /etc/commissaire/storage.conf.
projectatomic · Dec 9, 2016 · 935d5aa · 935d5aa
1 parent 3d8d66a
commit 935d5aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/conf/systemd/commissaire-storage.service b/conf/systemd/commissaire-storage.service
@@ -4,7 +4,7 @@ Documentation=https://commissaire.readthedocs.io/
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/commissaire-storage-service -c /etc/commisasire/storage.conf
+ExecStart=/usr/bin/commissaire-storage-service
 PIDFile=/var/run/commissaire-storage-service.pid
 Type=simple
 

diff --git a/src/commissaire_service/storage/__init__.py b/src/commissaire_service/storage/__init__.py
@@ -57,7 +57,8 @@ def __init__(self, exchange_name, connection_url, config_file=None):
                              if isinstance(v, type) and
                              issubclass(v, models.Model)}
 
-        config_data = read_config_file(config_file)
+        config_data = read_config_file(
+            config_file, '/etc/commissaire/storage.conf')
         store_handlers = config_data.get('storage_handlers', [])
 
         # Configure store handlers from user data.