[v2,05/13] config: Look up log file in configuration file
diff mbox series

Message ID 20240423103034.364150-6-mzamazal@redhat.com
State Superseded
Headers show
Series
  • Add global configuration file
Related show

Commit Message

Milan Zamazal April 23, 2024, 10:30 a.m. UTC 
This requires change in LIBCAMERA_LOG_FILE interpretation so that we can
disable the log file in isolated processes.  If LIBCAMERA_LOG_FILE is
defined but empty, it means there is no log file, even if defined in the
configuration file.  This should cause no compatibility trouble since
opening a file with an empty name makes little sense.

The configuration snippet:

  configuration:
    log:
      file: FILENAME

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
---
 src/libcamera/base/global_configuration.cpp |  1 +
 src/libcamera/base/log.cpp                  | 13 +++++++++----
 src/libcamera/process.cpp                   | 11 ++++++++---
 3 files changed, 18 insertions(+), 7 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp
index c27c91b9..f72ca352 100644
--- a/src/libcamera/base/global_configuration.cpp
+++ b/src/libcamera/base/global_configuration.cpp
@@ -34,6 +34,7 @@  LOG_DEFINE_CATEGORY(Configuration)
  * \code{.yaml}
  * configuration:
  *   log:
+ *     file: syslog
  *     levels: 'IPAManager:DEBUG'
  * \endcode
  *
diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp
index 7e58e4f9..ff6be340 100644
--- a/src/libcamera/base/log.cpp
+++ b/src/libcamera/base/log.cpp
@@ -607,16 +607,21 @@  Logger::Logger()
  */
 void Logger::parseLogFile()
 {
-	const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE");
-	if (!file)
+	std::optional<std::string> file =
+		GlobalConfiguration::envOption("LIBCAMERA_LOG_FILE", "log.file");
+	if (!file.has_value())
 		return;
 
-	if (!strcmp(file, "syslog")) {
+	auto fileValue = file.value();
+	if (fileValue == "")
+		return;
+
+	if (fileValue == "syslog") {
 		logSetTarget(LoggingTargetSyslog);
 		return;
 	}
 
-	logSetFile(file, false);
+	logSetFile(fileValue.c_str(), false);
 }
 
 /**
diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp
index 86a382fb..4bfce285 100644
--- a/src/libcamera/process.cpp
+++ b/src/libcamera/process.cpp
@@ -12,7 +12,9 @@ 
 #include <fcntl.h>
 #include <iostream>
 #include <list>
+#include <optional>
 #include <signal.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -24,6 +26,8 @@ 
 #include <libcamera/base/log.h>
 #include <libcamera/base/utils.h>
 
+#include "libcamera/internal/global_configuration.h"
+
 /**
  * \file process.h
  * \brief Process object
@@ -263,9 +267,10 @@  int Process::start(const std::string &path,
 
 		closeAllFdsExcept(fds);
 
-		const char *file = utils::secure_getenv("LIBCAMERA_LOG_FILE");
-		if (file && strcmp(file, "syslog"))
-			unsetenv("LIBCAMERA_LOG_FILE");
+		std::optional<std::string> file =
+			GlobalConfiguration::envOption("LIBCAMERA_LOG_FILE", "log.file");
+		if (file.has_value() && file.value() != "syslog")
+			setenv("LIBCAMERA_LOG_FILE", "", 1);
 
 		const char **argv = new const char *[args.size() + 2];
 		unsigned int len = args.size();