From c85a9ff16062c19ff563332662e08081fb68172c Mon Sep 17 00:00:00 2001 From: duhenglucky Date: Fri, 11 Oct 2019 17:53:23 +0800 Subject: [PATCH 1/3] feat(consumer) add log setting for consumer --- src/PythonWrapper.cpp | 24 ++++++++++++++++++++++++ src/PythonWrapper.h | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/PythonWrapper.cpp b/src/PythonWrapper.cpp index e41bbdf..9868db6 100644 --- a/src/PythonWrapper.cpp +++ b/src/PythonWrapper.cpp @@ -337,6 +337,18 @@ int PySetPushConsumerMessageModel(void *consumer, CMessageModel messageModel) { return SetPushConsumerMessageModel((CPushConsumer *) consumer, messageModel); } +int PySetPushConsumerLogPath(void *consumer, const char *logPath) { + return SetPushConsumerLogPath((CPushConsumer *) consumer, logPath); +} + +int PySetPushConsumerLogFileNumAndSize(void *consumer, int fileNum, long fileSize) { + return SetPushConsumerLogFileNumAndSize((CPushConsumer *) consumer, fileNum, fileSize); +} + +int PySetPushConsumerLogLevel(void *consumer, CLogLevel level) { + return SetPushConsumerLogLevel((CPushConsumer *) consumer, level); +} + //push consumer int PySetPullConsumerNameServerDomain(void *consumer, const char *domain) { return SetPullConsumerNameServerDomain((CPullConsumer *) consumer, domain); @@ -386,6 +398,15 @@ BOOST_PYTHON_MODULE (librocketmqclientpython) { .value("BROADCASTING", BROADCASTING) .value("CLUSTERING", CLUSTERING); + enum_("CLogLevel") + .value("E_LOG_LEVEL_FATAL", E_LOG_LEVEL_FATAL) + .value("E_LOG_LEVEL_ERROR", E_LOG_LEVEL_ERROR) + .value("E_LOG_LEVEL_WARN", E_LOG_LEVEL_WARN) + .value("E_LOG_LEVEL_INFO", E_LOG_LEVEL_INFO) + .value("E_LOG_LEVEL_DEBUG", E_LOG_LEVEL_DEBUG) + .value("E_LOG_LEVEL_TRACE", E_LOG_LEVEL_TRACE) + .value("E_LOG_LEVEL_LEVEL_NUM", E_LOG_LEVEL_LEVEL_NUM); + //For Message def("CreateMessage", PyCreateMessage, return_value_policy()); @@ -445,6 +466,9 @@ BOOST_PYTHON_MODULE (librocketmqclientpython) { def("Subscribe", PySubscribe); def("RegisterMessageCallback", PyRegisterMessageCallback); def("RegisterMessageCallbackOrderly", PyRegisterMessageCallbackOrderly); + def("SetPushConsumerLogPath", PySetPushConsumerLogPath); + def("SetPushConsumerLogFileNumAndSize", PySetPushConsumerLogFileNumAndSize); + def("SetPushConsumerLogLevel", PySetPushConsumerLogLevel); //pull consumer def("SetPullConsumerNameServerDomain", PySetPullConsumerNameServerDomain); diff --git a/src/PythonWrapper.h b/src/PythonWrapper.h index e421448..787a8b8 100644 --- a/src/PythonWrapper.h +++ b/src/PythonWrapper.h @@ -146,9 +146,11 @@ int PythonMessageCallBackInner(CPushConsumer *consumer, CMessageExt *msg); int PySetPushConsumerThreadCount(void *consumer, int threadCount); int PySetPushConsumerMessageBatchMaxSize(void *consumer, int batchSize); int PySetPushConsumerInstanceName(void *consumer, const char *instanceName); -int PySetPushConsumerSessionCredentials(void *consumer, const char *accessKey, const char *secretKey, - const char *channel); +int PySetPushConsumerSessionCredentials(void *consumer, const char *accessKey, const char *secretKey, const char *channel); int PySetPushConsumerMessageModel(void *consumer, CMessageModel messageModel); +int PySetPushConsumerLogPath(void *consumer, const char *logPath); +int PySetPushConsumerLogFileNumAndSize(void *consumer, int fileNum, long fileSize); +int PySetPushConsumerLogLevel(void *consumer, CLogLevel level); //push consumer int PySetPullConsumerNameServerDomain(void *consumer, const char *domain); From 089f2872ac339b79fa580b25cb58eed559cd8a83 Mon Sep 17 00:00:00 2001 From: duhenglucky Date: Fri, 11 Oct 2019 19:54:20 +0800 Subject: [PATCH 2/3] feat(producer) add producer log setting support --- src/PythonWrapper.cpp | 18 +++++++++++++++++- src/PythonWrapper.h | 4 ++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/PythonWrapper.cpp b/src/PythonWrapper.cpp index 9868db6..404c92a 100644 --- a/src/PythonWrapper.cpp +++ b/src/PythonWrapper.cpp @@ -162,7 +162,18 @@ int PySetProducerCompressLevel(void *producer, int level) { int PySetProducerMaxMessageSize(void *producer, int size) { return SetProducerMaxMessageSize((CProducer *)producer, size); } - +int PySetProducerLogPath(void *producer, const char *logPath) { + return SetProducerLogPath((CProducer *) producer, logPath); +} +int PySetProducerLogFileNumAndSize(void *producer, int fileNum, long fileSize) { + return SetProducerLogFileNumAndSize((CProducer *) producer, fileNum, fileSize); +} +int PySetProducerLogLevel(void *producer, CLogLevel level) { + return SetProducerLogLevel((CProducer *) producer, level); +} +int PySetProducerSendMsgTimeout(void *producer, int timeout) { + return SetProducerSendMsgTimeout((CProducer *) producer, timeout); +} PySendResult PySendMessageSync(void *producer, void *msg) { PySendResult ret; @@ -443,6 +454,11 @@ BOOST_PYTHON_MODULE (librocketmqclientpython) { def("SetProducerSessionCredentials", PySetProducerSessionCredentials); def("SetProducerCompressLevel", PySetProducerCompressLevel); def("SetProducerMaxMessageSize", PySetProducerMaxMessageSize); + def("SetProducerSendMsgTimeout", PySetProducerSendMsgTimeout); + + def("SetProducerLogPath", PySetProducerLogPath); + def("SetProducerLogFileNumAndSize", PySetProducerLogFileNumAndSize); + def("SetProducerLogLevel", PySetProducerLogLevel); def("SendMessageSync", PySendMessageSync); def("SendMessageAsync", PySendMessageAsync); diff --git a/src/PythonWrapper.h b/src/PythonWrapper.h index 787a8b8..29a4952 100644 --- a/src/PythonWrapper.h +++ b/src/PythonWrapper.h @@ -115,6 +115,10 @@ int PySetProducerInstanceName(void *producer, const char *instanceName); int PySetProducerSessionCredentials(void *producer, const char *accessKey, const char *secretKey, const char *channel); int PySetProducerCompressLevel(void *producer, int level); int PySetProducerMaxMessageSize(void *producer, int size); +int PySetProducerLogPath(void *producer, const char *logPath); +int PySetProducerLogFileNumAndSize(void *producer, int fileNum, long fileSize); +int PySetProducerLogLevel(void *producer, CLogLevel level); +int PySetProducerSendMsgTimeout(void *producer, int timeout); PySendResult PySendMessageSync(void *producer, void *msg); int PySendMessageOneway(void *producer, void *msg); From 9f84531c276afb984e447f247ddb957cd3bfdc22 Mon Sep 17 00:00:00 2001 From: duhenglucky Date: Fri, 11 Oct 2019 20:09:11 +0800 Subject: [PATCH 3/3] test(client) add log setting test --- test/TestConsumeMessages.py | 1 + test/TestSendMessages.py | 1 + 2 files changed, 2 insertions(+) diff --git a/test/TestConsumeMessages.py b/test/TestConsumeMessages.py index 9f6aab7..c3c252a 100644 --- a/test/TestConsumeMessages.py +++ b/test/TestConsumeMessages.py @@ -56,6 +56,7 @@ def init_consumer(_group, _topic, _tag): consumer = CreatePushConsumer(_group) SetPushConsumerNameServerAddress(consumer, name_srv) SetPushConsumerThreadCount(consumer, 1) + SetPushConsumerLogLevel(consumer, CLogLevel.E_LOG_LEVEL_INFO) SetPushConsumerMessageModel(consumer, CMessageModel.CLUSTERING) Subscribe(consumer, _topic, _tag) RegisterMessageCallback(consumer, consumer_message, None) diff --git a/test/TestSendMessages.py b/test/TestSendMessages.py index 97cfd3c..9baf78e 100644 --- a/test/TestSendMessages.py +++ b/test/TestSendMessages.py @@ -26,6 +26,7 @@ def init_producer(): producer = CreateProducer('TestProducer') + SetProducerLogLevel(producer, CLogLevel.E_LOG_LEVEL_INFO) SetProducerNameServerAddress(producer, name_srv) StartProducer(producer) return producer