From f437c473beb0d854cb574d09336f35f799cf6fba Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Thu, 15 Sep 2022 17:32:12 +0800 Subject: [PATCH 01/12] Update logger.cpp --- common/logger.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index f63294829..b6c26f16a 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,7 +233,12 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - dynamic_cast(selectable)->pop(koValues); + ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); + if (consumerStateTable == NULL) + { + continue; + } + consumerStateTable->pop(koValues); std::string key = kfvKey(koValues), op = kfvOp(koValues); if (op != SET_COMMAND || !m_settingChangeObservers.contains(key)) From 222d457138dae7017645c035dfca1b4dcdfd2228 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Fri, 16 Sep 2022 10:04:10 +0800 Subject: [PATCH 02/12] Update logger.cpp --- common/logger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index b6c26f16a..eb71fd1e3 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,7 +233,8 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); + ConsumerStateTable *consumerStateTable = NULL; + consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { continue; From 599300e255dfef681de4a111962ee5fc542f3c3f Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Fri, 16 Sep 2022 10:05:06 +0800 Subject: [PATCH 03/12] Update logger.cpp --- common/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index eb71fd1e3..9a0e1838d 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,7 +233,7 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - ConsumerStateTable *consumerStateTable = NULL; + ConsumerStateTable *consumerStateTable; consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { From e24f3759e64f796dbc48190b10a45a1d0b41d975 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Fri, 16 Sep 2022 14:58:26 +0800 Subject: [PATCH 04/12] Update logger.cpp --- common/logger.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/common/logger.cpp b/common/logger.cpp index 9a0e1838d..19b4b09fa 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,6 +233,7 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; + ConsumerStateTable *consumerStateTable; consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) From f89ff3350882844fffa84d78c7abc56b338d00ce Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Tue, 20 Sep 2022 13:46:21 +0800 Subject: [PATCH 05/12] Update logger.cpp --- common/logger.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/logger.cpp b/common/logger.cpp index 19b4b09fa..b6c26f16a 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,9 +233,7 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - - ConsumerStateTable *consumerStateTable; - consumerStateTable = dynamic_cast(selectable); + ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { continue; From dca82297ddae4b228b075644a4e64d996deddc80 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Wed, 21 Sep 2022 18:16:49 +0800 Subject: [PATCH 06/12] Update logger.cpp --- common/logger.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index b6c26f16a..eb71fd1e3 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -233,7 +233,8 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); + ConsumerStateTable *consumerStateTable = NULL; + consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { continue; From a9e7bba1de02e228a42b6d08986c0655b75ba3d2 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Tue, 11 Oct 2022 18:41:06 +0800 Subject: [PATCH 07/12] Update logger.cpp --- common/logger.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/common/logger.cpp b/common/logger.cpp index eb71fd1e3..435700e5c 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include "schema.h" #include "select.h" #include "dbconnector.h" @@ -233,12 +234,8 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - ConsumerStateTable *consumerStateTable = NULL; - consumerStateTable = dynamic_cast(selectable); - if (consumerStateTable == NULL) - { - continue; - } + ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); + assert(consumerStateTable != NULL); consumerStateTable->pop(koValues); std::string key = kfvKey(koValues), op = kfvOp(koValues); From 1130c0b289780b770109396664ac828205b4acfe Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:35:43 +0800 Subject: [PATCH 08/12] Update logger.cpp --- common/logger.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/logger.cpp b/common/logger.cpp index 435700e5c..fb94a5efb 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -1,5 +1,5 @@ #include "logger.h" - +#include #include #include #include @@ -8,7 +8,6 @@ #include #include #include -#include #include "schema.h" #include "select.h" #include "dbconnector.h" From d697a02e7fc81254862c811a4a15b567f8d88cd8 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:40:38 +0800 Subject: [PATCH 09/12] Update logger.cpp --- common/logger.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/logger.cpp b/common/logger.cpp index fb94a5efb..ad13dfb97 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -1,5 +1,5 @@ #include "logger.h" -#include + #include #include #include @@ -233,8 +233,10 @@ void Logger::settingThread() } KeyOpFieldsValuesTuple koValues; - ConsumerStateTable *consumerStateTable = dynamic_cast(selectable); - assert(consumerStateTable != NULL); + ConsumerStateTable *consumerStateTable = NULL; + consumerStateTable = dynamic_cast(selectable); + if (consumerStateTable == NULL) + continue; consumerStateTable->pop(koValues); std::string key = kfvKey(koValues), op = kfvOp(koValues); From 97683083ccc9c7f801af91963752120125dc8f72 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:38:58 +0800 Subject: [PATCH 10/12] Update logger.cpp --- common/logger.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index ad13dfb97..0ff057470 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -236,7 +236,10 @@ void Logger::settingThread() ConsumerStateTable *consumerStateTable = NULL; consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) - continue; + { + SWSS_LOG_ERROR("dynamic_cast returns NULL."); + break; + } consumerStateTable->pop(koValues); std::string key = kfvKey(koValues), op = kfvOp(koValues); From 022ff37d01f39778b34472ecb17ac591fe088c29 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Wed, 19 Oct 2022 16:52:44 +0800 Subject: [PATCH 11/12] Update logger.cpp --- common/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index 0ff057470..b12b5d557 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -237,7 +237,7 @@ void Logger::settingThread() consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { - SWSS_LOG_ERROR("dynamic_cast returns NULL."); + SWSS_LOG_ERROR("dynamic_cast returns NULL"); break; } consumerStateTable->pop(koValues); From bb43f05fc5aba7697e66009f5b4d2c64e3420665 Mon Sep 17 00:00:00 2001 From: pettershao-ragilenetworks <81281940+pettershao-ragilenetworks@users.noreply.github.com> Date: Mon, 24 Oct 2022 11:13:34 +0800 Subject: [PATCH 12/12] rerun failed job --- common/logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/logger.cpp b/common/logger.cpp index b12b5d557..de3e955de 100644 --- a/common/logger.cpp +++ b/common/logger.cpp @@ -237,7 +237,7 @@ void Logger::settingThread() consumerStateTable = dynamic_cast(selectable); if (consumerStateTable == NULL) { - SWSS_LOG_ERROR("dynamic_cast returns NULL"); + SWSS_LOG_ERROR("dynamic_cast returned NULL"); break; } consumerStateTable->pop(koValues);