{"id":21359,"url":"https://patchwork.libcamera.org/api/patches/21359/?format=json","web_url":"https://patchwork.libcamera.org/patch/21359/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20240925095850.348259-7-mzamazal@redhat.com>","date":"2024-09-25T09:58:38","name":"[v4,06/15] config: Look up log file in configuration file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"76c90e7ed6fffbfdee588d8629eb593723402b55","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21359/mbox/","series":[{"id":4623,"url":"https://patchwork.libcamera.org/api/series/4623/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4623","date":"2024-09-25T09:58:32","name":"Add global configuration file","version":4,"mbox":"https://patchwork.libcamera.org/series/4623/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21359/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21359/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 83B5FC0F1B\n\tfor ;\n\tWed, 25 Sep 2024 09:59:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9DBEB6351A;\n\tWed, 25 Sep 2024 11:59:27 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 953EA6350B\n\tfor ;\n\tWed, 25 Sep 2024 11:59:19 +0200 (CEST)","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-616-WpbMcYyaP8yWNaTpkrX6AQ-1;\n\tWed, 25 Sep 2024 05:59:16 -0400","from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (unknown\n\t[10.30.177.12])\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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id F322A193E8C4; Wed, 25 Sep 2024 09:59:15 +0000 (UTC)","from nuthatch.redhat.com (unknown [10.45.225.29])\n\tby mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 7D70F19560AA; Wed, 25 Sep 2024 09:59:14 +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=\"h9YFV4s1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1727258358;\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=UDWIP0UoVeZ+nzaeRd/D3ohyXpVfMoKB1PmSCkY8nYg=;\n\tb=h9YFV4s1oMYgdm0x1Yz9a/dvRa4QGXcIxr9yaHS7kHxxweQvL+3LSbKwzxPAwvE6HuvkdE\n\t/e6EEygDxcJxbwsvTiOr6iwwhfWQSREMej/ltBppfyRVyHFuNVRlnaAp+/TSIjyWH2MO4c\n\tkVJ+lL9f3yqdyvWZ+5kjFSQ+T8E9OkM=","X-MC-Unique":"WpbMcYyaP8yWNaTpkrX6AQ-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ,\n\tKieran Bingham ,\n\tNaushir Patuck ","Subject":"[PATCH v4 06/15] config: Look up log file in configuration file","Date":"Wed, 25 Sep 2024 11:58:38 +0200","Message-ID":"<20240925095850.348259-7-mzamazal@redhat.com>","In-Reply-To":"<20240925095850.348259-1-mzamazal@redhat.com>","References":"<20240925095850.348259-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.0 on 10.30.177.12","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 b202cef9b..b64bf28e2 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 891b4ae9d..07352f6c1 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 bc9833f41..c034044cf 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -11,7 +11,9 @@\n #include \n #include \n #include \n+#include \n #include \n+#include \n #include \n #include \n #include \n@@ -23,6 +25,8 @@\n #include \n #include \n \n+#include \"libcamera/internal/global_configuration.h\"\n+\n /**\n * \\file process.h\n * \\brief Process object\n@@ -261,9 +265,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":["v4","06/15"]}