fix

alibaba · Nov 24, 2023 · f2c18d7 · f2c18d7
1 parent 3c46dc2
commit f2c18d7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/core/config/UserLogConfigParser.cpp b/core/config/UserLogConfigParser.cpp
diff --git a/core/config/watcher/CMakeLists.txt b/core/config/watcher/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright 2023 iLogtail Authors
+# Copyright 2022 iLogtail Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,20 +13,11 @@
 # limitations under the License.
 
 cmake_minimum_required(VERSION 2.9)
-<<<<<<<< HEAD:core/application/CMakeLists.txt
-project(application)
-========
 project(config_watcher)
->>>>>>>> duming/stage4:core/config/watcher/CMakeLists.txt
 
 file(GLOB LIB_SOURCE_FILES *.cpp *.h)
 append_source_files(LIB_SOURCE_FILES)
 add_library(${PROJECT_NAME} STATIC ${LIB_SOURCE_FILES})
-<<<<<<<< HEAD:core/application/CMakeLists.txt
-target_link_libraries(${PROJECT_NAME} common)
-target_link_libraries(${PROJECT_NAME} monitor)
-========
 target_link_libraries(${PROJECT_NAME} config)
 target_link_libraries(${PROJECT_NAME} logger)
 target_link_libraries(${PROJECT_NAME} pipeline)
->>>>>>>> duming/stage4:core/config/watcher/CMakeLists.txt
diff --git a/core/reader/LogFileReader.h b/core/reader/LogFileReader.h
@@ -213,7 +213,7 @@ class LogFileReader {
 
     bool CheckDevInode();
 
-    bool CheckFileSignatureAndOffset(int64_t& fileSize);
+    bool CheckFileSignatureAndOffset(bool isOpenOnUpdate);
 
     void UpdateLogPath(const std::string& filePath) {
         if (mHostLogPath == filePath) {