From 1e71684f673a90c768a2b04671a9c6da85e10679 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Mon, 4 Jan 2016 10:04:00 +0100 Subject: [PATCH] [FIX] ignore dbfilter, fixes #58 --- queue_job/jobrunner/runner.py | 4 ---- queue_job/queue/worker.py | 10 +--------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py index 87e4770c58..5639b9959e 100644 --- a/queue_job/jobrunner/runner.py +++ b/queue_job/jobrunner/runner.py @@ -112,7 +112,6 @@ from contextlib import closing import logging import os -import re import select import threading import time @@ -266,9 +265,6 @@ def get_db_names(self): db_names = openerp.tools.config['db_name'].split(',') else: db_names = openerp.service.db.exp_list(True) - dbfilter = openerp.tools.config['dbfilter'] - if dbfilter and '%d' not in dbfilter and '%h' not in dbfilter: - db_names = [d for d in db_names if re.match(dbfilter, d)] return db_names def close_databases(self, remove_jobs=True): diff --git a/queue_job/queue/worker.py b/queue_job/queue/worker.py index f06fc0e70d..e9a5873f2a 100644 --- a/queue_job/queue/worker.py +++ b/queue_job/queue/worker.py @@ -19,7 +19,6 @@ # ############################################################################## -import re import logging import os import threading @@ -260,14 +259,7 @@ def available_db_names(): if config['db_name']: db_names = config['db_name'].split(',') else: - services = openerp.netsvc.ExportService._services - if services.get('db'): - db_names = services['db'].exp_list(True) - else: - db_names = [] - dbfilter = config['dbfilter'] - if dbfilter and '%d' not in dbfilter and '%h' not in dbfilter: - db_names = [d for d in db_names if re.match(dbfilter, d)] + db_names = db.exp_list(True) available_db_names = [] for db_name in db_names: session_hdl = ConnectorSessionHandler(db_name,