From 662df8aea1b4f273e6b25b9d62c538ebc2fcb8a5 Mon Sep 17 00:00:00 2001
From: David Douard <david.douard@sdfa3.org>
Date: Wed, 6 Feb 2019 10:22:11 +0100
Subject: [PATCH] Change the lister_db_url config option into a 'lister' one

with conventional structure
  { 'cls': cls, 'args': {}}

r
---
 swh/lister/core/lister_base.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/swh/lister/core/lister_base.py b/swh/lister/core/lister_base.py
index ce8a54b..b09fe13 100644
--- a/swh/lister/core/lister_base.py
+++ b/swh/lister/core/lister_base.py
@@ -223,7 +223,13 @@ class SWHListerBase(abc.ABC, config.SWHConfig):
             'args': {
                 'url': 'http://localhost:5008/'
             },
-        })
+        }),
+        'lister': ('dict', {
+            'cls': 'local',
+            'args': {
+                'db': 'postgresql:///lister',
+            },
+        }),
     }
 
     @property
@@ -233,8 +239,6 @@ class SWHListerBase(abc.ABC, config.SWHConfig):
     @property
     def ADDITIONAL_CONFIG(self):  # noqa: N802
         return {
-            'lister_db_url':
-                ('str', 'postgresql:///lister-%s' % self.LISTER_NAME),
             'credentials':
                 ('list[dict]', []),
             'cache_responses':
@@ -264,7 +268,7 @@ class SWHListerBase(abc.ABC, config.SWHConfig):
         logger.debug('%s CONFIG=%s' % (self, self.config))
         self.storage = get_storage(**self.config['storage'])
         self.scheduler = get_scheduler(**self.config['scheduler'])
-        self.db_engine = create_engine(self.config['lister_db_url'])
+        self.db_engine = create_engine(self.config['lister']['args']['db'])
         self.mk_session = sessionmaker(bind=self.db_engine)
         self.db_session = self.mk_session()