Logger initialization fixes

bpf_generic/src/log.cpp

@@ -2,7 +2,7 @@
 
 #include <spdlog/sinks/rotating_file_sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
-#include <filesystem>
+#include <system_error>
 #include <unistd.h>
 #include <vector>
 
@@ -11,22 +11,23 @@ namespace logging {
 constexpr std::size_t max_size = 10 * 1024 * 1024;
 constexpr std::size_t max_files = 3;
 
-void setUpLogger(const std::string& logDir, bool logToStdout) {
-	namespace fs = std::filesystem;
+namespace fs = std::filesystem;
 
+void setUpLogger(const fs::path logDir, bool logToStdout) {
 	std::vector<spdlog::sink_ptr> sinks;
+
 	if (logToStdout){
 		sinks.emplace_back(std::make_shared<spdlog::sinks::stdout_color_sink_mt>());
 	}
 
 	if (!logDir.empty()) {
-		fs::path logPath;
-		if (!fs::is_directory(logDir)) {
-			spdlog::warn("{} doesn't exist or is not a directory.", logDir);
-		}
-		else {
-			std::string logFile = fmt::format("{}/oneagent_nettracer_{:d}.log", logDir, getpid());
-			sinks.emplace_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>(logFile, max_size, max_files));
+		std::error_code ec;
+		bool dirExists = fs::exists(logDir, ec);
+		if (!dirExists || ec || !fs::is_directory(logDir)) {
+			exit(5);
+		} else {
+			auto  logFile = logDir / fmt::format("oneagent_nettracer_{:d}.log", getpid());
+			sinks.emplace_back(std::make_shared<spdlog::sinks::rotating_file_sink_mt>(logFile.string(), max_size, max_files));
 		}
 	}
 

bpf_generic/src/log.h

@@ -2,6 +2,7 @@
 
 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_DEBUG
 #include <spdlog/spdlog.h>
+#include <filesystem>
 #include <memory>
 #include <string>
 
@@ -13,7 +14,7 @@ inline std::shared_ptr<spdlog::logger> getLogger() {
 	return spdlog::get(LOGGER_NAME);
 }
 
-void setUpLogger(const std::string& logDir, bool logToStdout);
+void setUpLogger(const std::filesystem::path logDir, bool logToStdout);
 
 } // namespace logging
 

nettracersrv/unified_log.cpp

@@ -8,9 +8,6 @@ bool setUpLogging(const boost::program_options::variables_map& vm) {
 	bool noStdoutLog = vm.count("no_stdout_log");
 	bool noFileLog =  logger_path.empty();
 
-	if (!noFileLog) {
-		std::filesystem::create_directory(logger_path);
-	}
 	logging::setUpLogger(logger_path, !noStdoutLog);
 	if (areDebugLogsEnabled(vm)) {
 		logging::getLogger()->set_level(spdlog::level::debug);

version.properties

@@ -1 +1 @@
-version=1.1.9
+version=1.1.10