Patch Detail
Show a patch.
GET /api/1.1/patches/22242/?format=api
{ "id": 22242, "url": "https://patchwork.libcamera.org/api/1.1/patches/22242/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22242/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20241206171148.1189292-6-mzamazal@redhat.com>", "date": "2024-12-06T17:11:36", "name": "[v6,05/16] 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/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22242/mbox/", "series": [ { "id": 4861, "url": "https://patchwork.libcamera.org/api/1.1/series/4861/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4861", "date": "2024-12-06T17:11:31", "name": "Add global configuration file", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4861/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22242/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22242/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 EB11EBF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 6 Dec 2024 17:12:26 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AB34667E3F;\n\tFri, 6 Dec 2024 18:12:26 +0100 (CET)", "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 6D94F67E30\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Dec 2024 18:12:24 +0100 (CET)", "from mx-prod-mc-03.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-638-Y9qUpnTsO6iEwMNVa-ClGQ-1;\n\tFri, 06 Dec 2024 12:12:18 -0500", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 02D0A19560B6; Fri, 6 Dec 2024 17:12:17 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.224.27])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 63ADB3000238; Fri, 6 Dec 2024 17:12: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=\"JJsgfPWw\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1733505143;\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=JhgE9foWQRItinmtojm73/9dE/66cA+E71VlRyivIB0=;\n\tb=JJsgfPWw1EIe6S6c3cYTIJEfur73VAp1gJQaxk32fXl81O8zRFEIn9bPHnpOlmyX8JPPxf\n\ty8f5ZER/d6e1rZSCPFOqc3WkKPeAAA9zGmhH2OjAccPGMKozd+qLfoA2n8vH83iF6xD42t\n\t2IZg86FrU3DnZENuoDvdvhIBptx7u7s=", "X-MC-Unique": "Y9qUpnTsO6iEwMNVa-ClGQ-1", "X-Mimecast-MFC-AGG-ID": "Y9qUpnTsO6iEwMNVa-ClGQ", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, Naushir Patuck\n\t<naush@raspberrypi.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<pobrn@protonmail.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v6 05/16] config: Look up log file in configuration file", "Date": "Fri, 6 Dec 2024 18:11:36 +0100", "Message-ID": "<20241206171148.1189292-6-mzamazal@redhat.com>", "In-Reply-To": "<20241206171148.1189292-1-mzamazal@redhat.com>", "References": "<20241206171148.1189292-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "2NHtlAE8xxOG4cIcjxDeVEn44De_Zv_F_nxNerjZPnE_1733505137", "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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <mzamazal@redhat.com>\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 84821f26..073096b5 100644\n--- a/src/libcamera/base/global_configuration.cpp\n+++ b/src/libcamera/base/global_configuration.cpp\n@@ -120,6 +120,7 @@ void initialize()\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 891b4ae9..07352f6c 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<std::string> 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 bc9833f4..c034044c 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -11,7 +11,9 @@\n #include <dirent.h>\n #include <fcntl.h>\n #include <list>\n+#include <optional>\n #include <signal.h>\n+#include <stdlib.h>\n #include <string.h>\n #include <sys/socket.h>\n #include <sys/types.h>\n@@ -23,6 +25,8 @@\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\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<std::string> 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": [ "v6", "05/16" ] }