From 7508181031b75d2cba2541372a746a64953f2e85 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 15 Jul 2024 14:53:58 +0200 Subject: [PATCH] MT#60312 remove mysql warnings Change-Id: I50d491dcb0325106a1fd743114aa06c4bd6ecae0 --- debian/patches/series | 5 +-- ...warn-to-dbg-for-log-messages-for-opt.patch | 33 +++++++++++++++++++ ...warn-to-dbg-for-log-messages-for-opt.patch | 26 +++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch create mode 100644 debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch diff --git a/debian/patches/series b/debian/patches/series index 0218ed619..ece3464ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -31,8 +31,9 @@ sipwise/sca-fix-on-hold-detection-when-upstream-flow.patch sipwise/sca-debug.patch sipwise/sca-fix-notify-after-bye.patch sipwise/sca-add-pai_avp-parameter.patch -## upstream 5.7 -# +## upstream 5.8 +upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch +upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch ## upstream master upstream/rtpengine_rework_rtpp_flags.patch upstream/cfgutils-expose-optional-second-string-key-for-lock.patch diff --git a/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch b/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch new file mode 100644 index 000000000..73ded731d --- /dev/null +++ b/debian/patches/upstream/0001-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch @@ -0,0 +1,33 @@ +From: Daniel-Constantin Mierla +Date: Wed, 19 Jun 2024 10:43:12 +0200 +Subject: db_mysql: switch warn to dbg for log messages for opt_ssl_mode + +- GH #3884 + +(cherry picked from commit 8f98317e92da61160a1c416e0da45938a205d358) +--- + src/modules/db_mysql/km_my_con.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c +index 561a003..50e3375 100644 +--- a/src/modules/db_mysql/km_my_con.c ++++ b/src/modules/db_mysql/km_my_con.c +@@ -143,7 +143,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) + #if MYSQL_VERSION_ID >= 100339 + mysql_options(ptr->con, MYSQL_OPT_SSL_ENFORCE, (void *)&(int){1}); + #else +- LM_WARN("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); ++ LM_DBG("ssl mode not supported by %s\n", MARIADB_BASE_VERSION); + #endif + break; + case 5: /* SSL_MODE_VERIFY_IDENTITY */ +@@ -151,7 +151,7 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) + (void *)&(int){1}); + break; + default: +- LM_WARN("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", ++ LM_DBG("opt_ssl_mode = %d not supported by MariaDB Connector/C\n", + db_mysql_opt_ssl_mode); + break; + } diff --git a/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch b/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch new file mode 100644 index 000000000..5f45ee4ac --- /dev/null +++ b/debian/patches/upstream/0002-db_mysql-switch-warn-to-dbg-for-log-messages-for-opt.patch @@ -0,0 +1,26 @@ +From: Victor Seva +Date: Wed, 19 Jun 2024 15:00:12 +0200 +Subject: db_mysql: switch warn to dbg for log messages for opt_ssl_ca option + +fixes #3884 + +(cherry picked from commit be5172a84b02a1ab4fc7e97e7dc0813056302bdd) +--- + src/modules/db_mysql/km_my_con.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/modules/db_mysql/km_my_con.c b/src/modules/db_mysql/km_my_con.c +index 50e3375..240d3f5 100644 +--- a/src/modules/db_mysql/km_my_con.c ++++ b/src/modules/db_mysql/km_my_con.c +@@ -184,8 +184,8 @@ struct my_con *db_mysql_new_connection(const struct db_id *id) + mysql_options( + ptr->con, MYSQL_OPT_SSL_CA, (const void *)db_mysql_opt_ssl_ca); + #else +- LM_WARN("opt_ssl_ca option not supported by mysql version (value %s) - " +- "ignoring\n", ++ LM_DBG("opt_ssl_ca option not supported by mysql version (value %s) - " ++ "ignoring\n", + db_mysql_opt_ssl_ca); + #endif /* MYSQL_OPT_SSL_CA */ +