Skip to content

Commit 1b031a4

Browse files
committed
Fix: Ensure process is able to exit when history file import is ever used (#1369)
1 parent a385396 commit 1b031a4

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

core/event_handler/HistoryFileImporter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace logtail {
2626

2727
HistoryFileImporter::HistoryFileImporter() {
2828
LOG_INFO(sLogger, ("HistoryFileImporter", "init"));
29-
static auto _doNotQuitThread = CreateThread([this]() { Run(); });
29+
mThread = CreateThread([this]() { Run(); });
3030
}
3131

3232
void HistoryFileImporter::PushEvent(const HistoryFileEvent& event) {

core/event_handler/HistoryFileImporter.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
#pragma once
1818
#include <string>
19-
#include <vector>
2019
#include <unordered_map>
2120
#include "common/StringTools.h"
2221
#include "common/CircularBuffer.h"
2322
#include "config/Config.h"
23+
#include "common/Thread.h"
2424

2525
namespace logtail {
2626

@@ -44,8 +44,8 @@ class HistoryFileImporter {
4444
HistoryFileImporter();
4545

4646
static HistoryFileImporter* GetInstance() {
47-
static HistoryFileImporter sFileImporter;
48-
return &sFileImporter;
47+
static HistoryFileImporter* sFileImporter = new HistoryFileImporter;
48+
return sFileImporter;
4949
}
5050

5151
void PushEvent(const HistoryFileEvent& event);
@@ -63,6 +63,7 @@ class HistoryFileImporter {
6363
CircularBufferSem<HistoryFileEvent, HISTORY_EVENT_MAX> mEventQueue;
6464
std::unordered_map<std::string, int64_t> mCheckPoints;
6565
FILE* mCheckPointPtr;
66+
ThreadPtr mThread;
6667
};
6768

6869
} // namespace logtail

0 commit comments

Comments
 (0)