post conflict resolution fixes

dynatrace-oss · Oct 25, 2023 · 11d6a0f · 11d6a0f
1 parent 7cd828c
commit 11d6a0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ebpfdiscoverysrv/src/main.cpp b/ebpfdiscoverysrv/src/main.cpp
@@ -202,9 +202,10 @@ int main(int argc, char** argv) {
 		if (unixSignalThread.joinable()) {
 			unixSignalThread.join();
 		}
-	}
-	if (servicesProvider.joinable()) {
-		servicesProvider.join();
+		LOG_TRACE("Waiting for services providing thread to exit.");
+		if (servicesProvider.joinable()) {
+			servicesProvider.join();
+		}
 	}
 
 	LOG_DEBUG("Exiting the program.");

diff --git a/libebpfdiscoveryproto/CMakeLists.txt b/libebpfdiscoveryproto/CMakeLists.txt
@@ -20,7 +20,7 @@ protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${PROTO_SOURCES})
 add_library(${TARGET} STATIC ${PROTO_SRCS} ${SOURCES})
 target_link_libraries(${TARGET} protobuf::libprotobuf)
 target_link_libraries(${TARGET} service)
-target_include_directories(${TARGET} PRIVATE src PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/${PROTO_DIR_NAME} headers)
+target_include_directories(${TARGET} PRIVATE src PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${PROTO_DIR_NAME} headers)
 
 if (BUILD_TESTS)
     list(APPEND TEST_SOURCES test/TranslatorTest.cpp)