From f721cc01bebbde984b34d606e24a530bc541f9d3 Mon Sep 17 00:00:00 2001 From: Liviu Chircu Date: Wed, 8 Jul 2020 18:15:45 +0300 Subject: [PATCH] b2b entities/logic: Inherit `db_default_url` if possible If there is still no DB URL, simply start without DB support (just as before) (cherry picked from commit ff7b5849751d11537d989afe2b17ef35ebd2a133) (cherry picked from commit a54424be0c0ff2cd42adf6a0d748ac2a866dc319) (cherry picked from commit 0684e98376a841b6b7351b23e23de1d9a804ba41) --- modules/b2b_entities/b2b_entities.c | 5 ++++- modules/b2b_logic/b2b_logic.c | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/b2b_entities/b2b_entities.c b/modules/b2b_entities/b2b_entities.c index 8989febd72d..9b98e2ff473 100644 --- a/modules/b2b_entities/b2b_entities.c +++ b/modules/b2b_entities/b2b_entities.c @@ -203,9 +203,12 @@ static int mod_init(void) return -1; } memset(&b2be_dbf, 0, sizeof(db_func_t)); + + if(b2be_db_mode) + init_db_url(db_url, 1); + if(b2be_db_mode && db_url.s) { - db_url.len = strlen(db_url.s); b2be_dbtable.len = strlen(b2be_dbtable.s); /* binding to database module */ diff --git a/modules/b2b_logic/b2b_logic.c b/modules/b2b_logic/b2b_logic.c index 622e90926a8..dcdeb7d9908 100644 --- a/modules/b2b_logic/b2b_logic.c +++ b/modules/b2b_logic/b2b_logic.c @@ -248,9 +248,11 @@ static int mod_init(void) return -1; } + if(b2bl_db_mode) + init_db_url(db_url, 1); + if(b2bl_db_mode && db_url.s) { - db_url.len = strlen(db_url.s); b2bl_dbtable.len = strlen(b2bl_dbtable.s); /* binding to database module */ if (db_bind_mod(&db_url, &b2bl_dbf))