Patch Detail
Show a patch.
GET /api/1.1/patches/19807/?format=api
{ "id": 19807, "url": "https://patchwork.libcamera.org/api/1.1/patches/19807/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19807/", "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": "<20240326112419.503286-6-mzamazal@redhat.com>", "date": "2024-03-26T11:24:08", "name": "[RFC,05/11] config: Look up log file in configuration file", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "9069b2b1bff598a62f01eefe1aec775ec48ed1e6", "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/19807/mbox/", "series": [ { "id": 4241, "url": "https://patchwork.libcamera.org/api/1.1/series/4241/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4241", "date": "2024-03-26T11:24:03", "name": "Add global configuration file", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4241/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19807/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19807/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 BC389C32C1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Mar 2024 11:26:28 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 333BD6332E;\n\tTue, 26 Mar 2024 12:26:28 +0100 (CET)", "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 ABE256333B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Mar 2024 12:26:21 +0100 (CET)", "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-441-nzEwsg7hN6m3j5yZCwgYIg-1; Tue, 26 Mar 2024 07:26:18 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 651D4185A784\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Mar 2024 11:26:18 +0000 (UTC)", "from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E2FC23C22;\n\tTue, 26 Mar 2024 11:26:17 +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=\"H7DObWjj\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1711452380;\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=+ReI+rMpjT3lfZesYrbQhHsFMUUrygKVbQtLH/oCUPY=;\n\tb=H7DObWjj2y1caL8Kw7VnZ/dj72cgcNuXTSswOAEnbntFfiixCj2LBhlqxp14H3cEZqNBlh\n\tk2zoCFl8Z+mbMAFompaPZXyynouAzAAFuTrGYfvoOciz+ptSKkI+4SWCQE286uqLteXKWH\n\tANKYggRfat7qrp92XrJN7qggrhgvXYs=", "X-MC-Unique": "nzEwsg7hN6m3j5yZCwgYIg-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[RFC PATCH 05/11] config: Look up log file in configuration file", "Date": "Tue, 26 Mar 2024 12:24:08 +0100", "Message-ID": "<20240326112419.503286-6-mzamazal@redhat.com>", "In-Reply-To": "<20240326112419.503286-1-mzamazal@redhat.com>", "References": "<20240326112419.503286-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.1", "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": "<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 disable\nthe log file in isolated processes. If LIBCAMERA_LOG_FILE is defined but empty,\nit means there is no log file, even if defined in the configuration file. This\nshould cause no compatibility trouble since opening a file with an empty name\nmakes 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/log.cpp | 13 +++++++++----\n src/libcamera/process.cpp | 11 ++++++++---\n 2 files changed, 17 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/libcamera/base/log.cpp b/src/libcamera/base/log.cpp\nindex 7e58e4f9..a373d38b 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 86a382fb..4bfce285 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -12,7 +12,9 @@\n #include <fcntl.h>\n #include <iostream>\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@@ -24,6 +26,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@@ -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<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": [ "RFC", "05/11" ] }