{"id":19920,"url":"https://patchwork.libcamera.org/api/1.1/patches/19920/?format=json","web_url":"https://patchwork.libcamera.org/patch/19920/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240423103034.364150-6-mzamazal@redhat.com>","date":"2024-04-23T10:30:20","name":"[v2,05/13] config: Look up log file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"eab5741aebaac9b0a6b2a3188b4587c7f51be851","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19920/mbox/","series":[{"id":4267,"url":"https://patchwork.libcamera.org/api/1.1/series/4267/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4267","date":"2024-04-23T10:30:15","name":"Add global configuration file","version":2,"mbox":"https://patchwork.libcamera.org/series/4267/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19920/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19920/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id D43A8C328D\n\tfor ;\n\tTue, 23 Apr 2024 10:31:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 51C6163421;\n\tTue, 23 Apr 2024 12:31:29 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C55A63417\n\tfor ;\n\tTue, 23 Apr 2024 12:31:24 +0200 (CEST)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-695-WA5jLzVCOZmus-j7lsAyhg-1; Tue, 23 Apr 2024 06:31:21 -0400","from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E74A812C39;\n\tTue, 23 Apr 2024 10:31:21 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.63])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C14DD1C0666C;\n\tTue, 23 Apr 2024 10:31:20 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"Oqno9TMu\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1713868283;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=8llLoDoqFBF0Nnuatsa/CTk9VKfNAki6ZYbOdQOpl+E=;\n\tb=Oqno9TMu6xfE7nturNJZvmp6GN/FEwHGNG5uxAFJuu0h8wXYHcbq33ojJYLsA6chllls0N\n\tFnlAr0RyDyYL3ypFd9WPG4gqbcVeE3Q1hnnzjgZaPPcMA/tzSL0LTdNbb3hsYHnV+mCNZh\n\tn/azWS4uymCgyl6ltiw/VA0lYNNGqmE=","X-MC-Unique":"WA5jLzVCOZmus-j7lsAyhg-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tNaushir Patuck ","Subject":"[PATCH v2 05/13] config: Look up log file in configuration file","Date":"Tue, 23 Apr 2024 12:30:20 +0200","Message-ID":"<20240423103034.364150-6-mzamazal@redhat.com>","In-Reply-To":"<20240423103034.364150-1-mzamazal@redhat.com>","References":"<20240423103034.364150-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.7","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This requires change in LIBCAMERA_LOG_FILE interpretation so that we can\ndisable the log file in isolated processes. If LIBCAMERA_LOG_FILE is\ndefined but empty, it means there is no log file, even if defined in the\nconfiguration file. This should cause no compatibility trouble since\nopening a file with an empty name makes little sense.\n\nThe configuration snippet:\n\n configuration:\n log:\n file: FILENAME\n\nSigned-off-by: Milan Zamazal \n---\n src/libcamera/base/global_configuration.cpp | 1 +\n src/libcamera/base/log.cpp | 13 +++++++++----\n src/libcamera/process.cpp | 11 ++++++++---\n 3 files changed, 18 insertions(+), 7 deletions(-)","diff":"diff --git a/src/libcamera/base/global_configuration.cpp b/src/libcamera/base/global_configuration.cpp\nindex c27c91b9..f72ca352 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -34,6 +34,7 @@ LOG_DEFINE_CATEGORY(Configuration)\n * \\code{.yaml}\n * configuration:\n * log:\n+ * file: syslog\n * levels: 'IPAManager:DEBUG'\n * \\endcode\n *\ndiff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\nindex 7e58e4f9..ff6be340 100644\n--- a/src/libcamera/base/log.cpp\n+++ b/src/libcamera/base/log.cpp\n@@ -607,16 +607,21 @@ Logger::Logger()\n */\n void Logger::parseLogFile()\n {\n-\tconst char *file = utils::secure_getenv(\"LIBCAMERA_LOG_FILE\");\n-\tif (!file)\n+\tstd::optional file =\n+\t\tGlobalConfiguration::envOption(\"LIBCAMERA_LOG_FILE\", \"log.file\");\n+\tif (!file.has_value())\n \t\treturn;\n \n-\tif (!strcmp(file, \"syslog\")) {\n+\tauto fileValue = file.value();\n+\tif (fileValue == \"\")\n+\t\treturn;\n+\n+\tif (fileValue == \"syslog\") {\n \t\tlogSetTarget(LoggingTargetSyslog);\n \t\treturn;\n \t}\n \n-\tlogSetFile(file, false);\n+\tlogSetFile(fileValue.c_str(), false);\n }\n \n /**\ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex 86a382fb..4bfce285 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -12,7 +12,9 @@\n #include \n #include \n #include \n+#include \n #include \n+#include \n #include \n #include \n #include \n@@ -24,6 +26,8 @@\n #include \n #include \n \n+#include \"libcamera/internal/global_configuration.h\"\n+\n /**\n * \\file process.h\n * \\brief Process object\n@@ -263,9 +267,10 @@ int Process::start(const std::string &path,\n \n \t\tcloseAllFdsExcept(fds);\n \n-\t\tconst char *file = utils::secure_getenv(\"LIBCAMERA_LOG_FILE\");\n-\t\tif (file && strcmp(file, \"syslog\"))\n-\t\t\tunsetenv(\"LIBCAMERA_LOG_FILE\");\n+\t\tstd::optional file =\n+\t\t\tGlobalConfiguration::envOption(\"LIBCAMERA_LOG_FILE\", \"log.file\");\n+\t\tif (file.has_value() && file.value() != \"syslog\")\n+\t\t\tsetenv(\"LIBCAMERA_LOG_FILE\", \"\", 1);\n \n \t\tconst char **argv = new const char *[args.size() + 2];\n \t\tunsigned int len = args.size();\n","prefixes":["v2","05/13"]}