reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the lister_db_url config option into a 'lister' one

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

r
This commit is contained in:
David Douard 2019-02-06 10:22:11 +01:00
parent b8381d8a1b
commit 662df8aea1
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
swh/lister/core/lister_base.py
View file

@ -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()