mirror of
https://github.com/kernelkit/infix.git
synced 2026-08-05 07:03:02 +02:00
107 lines
3.4 KiB
Diff
107 lines
3.4 KiB
Diff
From c4e4ad9d69b3bc62ee53f8088d6a192d288c6645 Mon Sep 17 00:00:00 2001
|
|
From: Joachim Wiberg <troglobit@gmail.com>
|
|
Date: Thu, 23 Nov 2023 18:49:36 +0100
|
|
Subject: [PATCH 2/2] src/main: add optional syslog support
|
|
Organization: Addiva Elektronik
|
|
|
|
Instead of having to redirect (colored) logs to stdout/stderr, this
|
|
patch adds support for logging directly to syslog with approximate
|
|
GLogLevel to syslog level mapping.
|
|
|
|
By default all LOG_NOTICE, g_message(), and higher log messages are
|
|
logged to LOG_LOCAL0 facility. This should of course be configurable
|
|
but is not at this stage.
|
|
|
|
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
|
|
---
|
|
src/main.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
|
|
1 file changed, 44 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main.c b/src/main.c
|
|
index 70bb7b5..cfc8607 100644
|
|
--- a/src/main.c
|
|
+++ b/src/main.c
|
|
@@ -9,6 +9,7 @@
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
+#include <syslog.h>
|
|
#include <sys/ioctl.h>
|
|
#include <unistd.h>
|
|
|
|
@@ -1961,6 +1962,38 @@ static gboolean unknown_start(int argc, char **argv)
|
|
return TRUE;
|
|
}
|
|
|
|
+static int log_level(GLogLevelFlags level)
|
|
+{
|
|
+ if (level & G_LOG_FLAG_FATAL)
|
|
+ return LOG_EMERG;
|
|
+ if (level & G_LOG_FLAG_RECURSION)
|
|
+ return LOG_ALERT;
|
|
+ if (level & G_LOG_LEVEL_CRITICAL)
|
|
+ return LOG_CRIT;
|
|
+ if (level & G_LOG_LEVEL_ERROR)
|
|
+ return LOG_ERR;
|
|
+ if (level & G_LOG_LEVEL_WARNING)
|
|
+ return LOG_WARNING;
|
|
+ if (level & G_LOG_LEVEL_MESSAGE)
|
|
+ return LOG_NOTICE;
|
|
+ if (level & G_LOG_LEVEL_INFO)
|
|
+ return LOG_INFO;
|
|
+ if (level & G_LOG_LEVEL_DEBUG)
|
|
+ return LOG_DEBUG;
|
|
+
|
|
+ /* Fallback to INFO for unknown levels */
|
|
+ return LOG_INFO;
|
|
+}
|
|
+
|
|
+static void syslog_handler(const gchar *domain, GLogLevelFlags level, const gchar *message, gpointer arg)
|
|
+{
|
|
+ /* unused */
|
|
+ (void)domain;
|
|
+ (void)arg;
|
|
+
|
|
+ syslog(log_level(level), "%s", message);
|
|
+}
|
|
+
|
|
typedef enum {
|
|
UNKNOWN = 0,
|
|
INSTALL,
|
|
@@ -2142,7 +2175,7 @@ static void create_option_groups(void)
|
|
|
|
static void cmdline_handler(int argc, char **argv)
|
|
{
|
|
- gboolean help = FALSE, debug = FALSE, version = FALSE;
|
|
+ gboolean help = FALSE, debug = FALSE, use_syslog = FALSE, version = FALSE;
|
|
gchar *confpath = NULL, *keyring = NULL, **intermediate = NULL, *mount = NULL;
|
|
char *cmdarg = NULL;
|
|
g_autoptr(GOptionContext) context = NULL;
|
|
@@ -2155,6 +2188,7 @@ static void cmdline_handler(int argc, char **argv)
|
|
{"intermediate", '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &intermediate, "intermediate CA file name", "PEMFILE"},
|
|
{"mount", '\0', 0, G_OPTION_ARG_FILENAME, &mount, "mount prefix", "PATH"},
|
|
{"debug", 'd', 0, G_OPTION_ARG_NONE, &debug, "enable debug output", NULL},
|
|
+ {"syslog", 's', 0, G_OPTION_ARG_NONE, &use_syslog, "use syslog instead of stdout", NULL},
|
|
{"version", '\0', 0, G_OPTION_ARG_NONE, &version, "display version", NULL},
|
|
{"help", 'h', 0, G_OPTION_ARG_NONE, &help, NULL, NULL},
|
|
{0}
|
|
@@ -2269,6 +2303,15 @@ static void cmdline_handler(int argc, char **argv)
|
|
g_message("Debug log domains: '%s'", domains);
|
|
}
|
|
|
|
+ if (use_syslog) {
|
|
+ GLogLevelFlags levels = G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION;
|
|
+ const char *ident = "rauc";
|
|
+
|
|
+ /* XXX: facility should be configurable */
|
|
+ openlog(ident, LOG_PID | LOG_NOWAIT, LOG_LOCAL0);
|
|
+ g_log_set_handler(ident, levels, syslog_handler, NULL);
|
|
+ }
|
|
+
|
|
/* get first parameter without dashes */
|
|
for (gint i = 1; i <= argc; i++) {
|
|
if (argv[i] && !g_str_has_prefix(argv[i], "-")) {
|
|
--
|
|
2.34.1
|
|
|