[FIX] ignore dbfilter containing %d or %h, fixes OCA#58

This is a temporary fix. In version 4.0, dbfilter will be completely ignored by connector.
nguyenminhchien · Nov 24, 2023 · d7c0ca3 · d7c0ca3
1 parent 4fb9d97
commit d7c0ca3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/queue_job/jobrunner/runner.py b/queue_job/jobrunner/runner.py
@@ -266,7 +266,7 @@ def get_db_names(self):
         else:
             db_names = openerp.service.db.exp_list(True)
         dbfilter = openerp.tools.config['dbfilter']
-        if 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
 

diff --git a/queue_job/queue/worker.py b/queue_job/queue/worker.py
@@ -266,7 +266,7 @@ def available_db_names():
             else:
                 db_names = []
         dbfilter = config['dbfilter']
-        if dbfilter and db_names:
+        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)]
         available_db_names = []
         for db_name in db_names: