lnk/microser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in log upload

Browse Source
This commit is contained in:
lnk
2025-03-04 17:29:04 +08:00
parent 87f0a48ad7
commit 1df5385fc9
16 changed files with 434 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
json/save2json.cpp
View File

@@ -68,6 +68,8 @@ extern "C" {
#define nullptr NULL
#endif
extern int INITFLAG;
extern QMutex kafka_data_list_mutex;
extern QList<Ckafka_data_t> kafka_data_list;
@@ -1888,6 +1890,8 @@ int find_mp_index_from_mp_id(std::string line)
int myMessageCallbackrtdata(CPushConsumer* consumer, CMessageExt* msg)
{
if(INITFLAG != 1)return 1;//<2F><>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD>
if (msg == NULL) {
std::cerr << "Received null message." << std::endl;
return E_RECONSUME_LATER;
@@ -1947,6 +1951,8 @@ int myMessageCallbackrtdata(CPushConsumer* consumer, CMessageExt* msg)
int myMessageCallbackupdate(CPushConsumer* consumer, CMessageExt* msg)
{
if(INITFLAG != 1)return 1;//<2F><>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD>
if (msg == NULL) {
std::cerr << "Received null message." << std::endl;
return E_RECONSUME_LATER;
@@ -1982,6 +1988,7 @@ int myMessageCallbackupdate(CPushConsumer* consumer, CMessageExt* msg)
int myMessageCallbackset(CPushConsumer* consumer, CMessageExt* msg)
{
if(INITFLAG != 1)return 1;//<2F><>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD>
if (msg == NULL) {
std::cerr << "Received null message." << std::endl;
return E_RECONSUME_LATER;
@@ -2016,6 +2023,7 @@ int myMessageCallbackset(CPushConsumer* consumer, CMessageExt* msg)
int myMessageCallbacklog(CPushConsumer* consumer, CMessageExt* msg)
{
if(INITFLAG != 1)return 1;//<2F><>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD>
if (msg == NULL) {
std::cerr << "Received null message." << std::endl;
return E_RECONSUME_LATER;
@@ -2050,6 +2058,7 @@ int myMessageCallbacklog(CPushConsumer* consumer, CMessageExt* msg)
int myMessageCallbackrecall(CPushConsumer* consumer, CMessageExt* msg)
{
if(INITFLAG != 1)return 1;//<2F><>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD>
//<2F><><EFBFBD><EFBFBD>
std::cout << "myMessageCallbackrecall"<< std::endl;

21
json/save2json.h
View File

@@ -110,6 +110,16 @@ protected:
//lnk20250106
extern bool showinshellflag;
#ifdef __cplusplus
extern "C" {
#endif
void doMonitorTaskmain(void);
#ifdef __cplusplus
}
#endif
class Worker : public QObject
{
Q_OBJECT
@@ -162,6 +172,11 @@ public slots:
connect(timer, SIGNAL(timeout()), this, SLOT(doPeriodicTask()));
timer->start(60000); // ÿ60<36>봥<EFBFBD><EBB4A5>һ<EFBFBD><D2BB>
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD>ں<EFBFBD><DABA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>滻<EFBFBD><E6BBBB><EFBFBD>̵߳ļ<CCB5><C4BC><EFBFBD>
QTimer *monitorTimer = new QTimer(this);
connect(monitorTimer, SIGNAL(timeout()), this, SLOT(doMonitorTask()));
monitorTimer->start(1000); // ÿ1<C3BF>봥<EFBFBD><EBB4A5>һ<EFBFBD><D2BB>
std::cout << "Timer started, event loop running in thread: " << QThread::currentThreadId() << std::endl;
qDebug() << "Timer started, event loop running in thread:" << QThread::currentThreadId();
}
@@ -202,6 +217,10 @@ private slots:
}
}
void doMonitorTask() {
doMonitorTaskmain();
}
void onNewConnection() {
if (!server) return;
@@ -336,7 +355,7 @@ private:
helpText += "log - Execute rocketmq_test_log\n";
helpText += "ledger <id> - Execute ledger with optional terminal_id\n";
helpText += "viewlog <level> - View logs (ERROR, WARN, NORMAL, DEBUG)\n";
helpText += "value <valuename> - Execute value print with valuename : iedcount frontfun frontindex remtable log\n";
helpText += "value <valuename> - Execute value print with valuename : iedcount frontfun frontindex remtable log init\n";
helpText += "exit - Exit the shell\n";
helpText += "help - Show this help message\n";
clientSocket->write(helpText.toUtf8());