From nobody Sun Feb 8 10:33:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585235972; cv=none; d=zohomail.com; s=zohoarc; b=GFfQXDoiXzpsZvFDlCNY71kfsOvO8VX96LPAqYoNAIoBGtkMpcsuzRTKBX9JZdh1dWYJrJq4WLQOElT3MWmT9OTPjBwhoGb96cVkJJpsnScB+mj1sb832Y14kbgXhB1cIbgxRrya7z9hXHiK9UCWCcJfeesKo0DTq/RHNWrpXos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585235972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fzsQlJpDrJztWkakbcxS59E7KSAoT8DXNyfzhrR2/xg=; b=h42uLshv0NUiUaT5H18I8+Zq6zgsuZSmbXQ2kQDAsrub3T3YpPYKmTCaqlo5yhyRbovBv6fvAAUOO7m4zWgN/fDWOHDB6TIiL0ugNzQbtvRmjHuW+HjMiFipoOwVAYOeCzy+3qz9XMLw/dYBq9EcPRGhZsu/1HHPgyS3MePMA/4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 158523597289687.57910280295118; Thu, 26 Mar 2020 08:19:32 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-302-zfLI9O2NPJ67pjKyMxp9ww-1; Thu, 26 Mar 2020 11:19:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F632800EBD; Thu, 26 Mar 2020 15:19:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36143CDBC5; Thu, 26 Mar 2020 15:19:21 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D89B51800B74; Thu, 26 Mar 2020 15:19:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02QFJJ5u029296 for ; Thu, 26 Mar 2020 11:19:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7150F107CD16; Thu, 26 Mar 2020 15:19:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CBC0107CD19 for ; Thu, 26 Mar 2020 15:19:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9C3B68F7830 for ; Thu, 26 Mar 2020 15:19:16 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-ebV2qbSGOPGbemC0HHpAIw-1; Thu, 26 Mar 2020 11:19:14 -0400 Received: by mail-wm1-f52.google.com with SMTP id m3so7456386wmi.0 for ; Thu, 26 Mar 2020 08:19:14 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id t2sm3754729wml.30.2020.03.26.08.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 08:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585235969; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=fzsQlJpDrJztWkakbcxS59E7KSAoT8DXNyfzhrR2/xg=; b=QCQaNhvz0yE+6Sodkt9bH2K/y0lAMqp01cWq2seNTai4lJV4aKwMoyEeVDr6Rlph8YmGX1 fy1WdLef5RRIu9FlyTAfh5vsn6ywwvMcggc704iSt9fzUoKHaaeupD05uMqVQU7rmvMxlh NnP5kvbLoISpjNV+4Bl6UwU25FYbWgU= X-MC-Unique: zfLI9O2NPJ67pjKyMxp9ww-1 X-MC-Unique: ebV2qbSGOPGbemC0HHpAIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kQXDNQx4JdT0FdU7JmEJZ7hGSqphCIdpjS6GbwWGUuc=; b=WHzjwDKzFl/nl5UFAdX+xfMQOc7qMpRzdiTgQWUoUQqobRnwSts52IG8iKzu8gn/+y xU2338QKUBIURVKFK3d+ikzTq5ESeWXe3au1CyQtfacD69hWPMuiFzGRtYGvgu3hR+DO g0qZOW1CHNzHpGEikOpbMH+EPnYEOGNZBjgdv9dFcF7RFSmjoGF05L0WHph98eGgeOAz 7jNjtCAVVFnqV6JJcSZlkYnOrXSvzfTH+Cz0XUuhrRkGAkgcIj91DCTOI7W9QXl0EFMS 7l7dnEs+8vDvJ0LTExMWn+xOo9ZSYqe06KfdA0AgTyWmgKOqbLvX74yQq6ScuPKjsRUC UC6w== X-Gm-Message-State: ANhLgQ1Ux2xqgq7m2cbr8FiFOfZEUlDLGRpLZUCPcw2ednfieOpAYvZw jTKpqJsonYqR+QWCB5UDB3kXyii0vXQ= X-Google-Smtp-Source: ADFU+vv/P+e8Vic53p7CGu+SVjNcwgZNsyPcQlPC8IXepkRFUAP03td+R4/ezhzu7bqzW30moF8rNA== X-Received: by 2002:a1c:7dc8:: with SMTP id y191mr389524wmc.167.1585235951524; Thu, 26 Mar 2020 08:19:11 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 3/4] logging: use shared daemon startup code Date: Thu, 26 Mar 2020 16:18:02 +0100 Message-Id: <20200326151803.2349357-4-r4f4rfs@gmail.com> In-Reply-To: <20200326151803.2349357-1-r4f4rfs@gmail.com> References: <20200326151803.2349357-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02QFJJ5u029296 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Rafael Fonseca --- src/logging/log_daemon.c | 239 +++++---------------------------------- 1 file changed, 29 insertions(+), 210 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 3319bf1f6f..dcafcda926 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -44,7 +44,7 @@ #include "viruuid.h" #include "virstring.h" #include "virgettext.h" -#include "virenum.h" +#include "virdaemon.h" =20 #include "log_daemon_dispatch.h" #include "log_protocol.h" @@ -65,36 +65,6 @@ virLogDaemonPtr logDaemon =3D NULL; =20 static bool execRestart; =20 -enum { - VIR_LOG_DAEMON_ERR_NONE =3D 0, - VIR_LOG_DAEMON_ERR_PIDFILE, - VIR_LOG_DAEMON_ERR_RUNDIR, - VIR_LOG_DAEMON_ERR_INIT, - VIR_LOG_DAEMON_ERR_SIGNAL, - VIR_LOG_DAEMON_ERR_PRIVS, - VIR_LOG_DAEMON_ERR_NETWORK, - VIR_LOG_DAEMON_ERR_CONFIG, - VIR_LOG_DAEMON_ERR_HOOKS, - VIR_LOG_DAEMON_ERR_REEXEC, - - VIR_LOG_DAEMON_ERR_LAST -}; - -VIR_ENUM_DECL(virDaemonErr); -VIR_ENUM_IMPL(virDaemonErr, - VIR_LOG_DAEMON_ERR_LAST, - "Initialization successful", - "Unable to obtain pidfile", - "Unable to create rundir", - "Unable to initialize log daemon", - "Unable to setup signal handlers", - "Unable to drop privileges", - "Unable to initialize network sockets", - "Unable to load configuration file", - "Unable to look for hook scripts", - "Unable to re-execute daemon", -); - static void * virLogDaemonClientNew(virNetServerClientPtr client, void *opaque); @@ -294,122 +264,6 @@ virLogDaemonNewPostExecRestart(virJSONValuePtr object= , bool privileged, } =20 =20 -static int -virLogDaemonForkIntoBackground(const char *argv0) -{ - int statuspipe[2]; - if (virPipeQuiet(statuspipe) < 0) - return -1; - - pid_t pid =3D fork(); - switch (pid) { - case 0: - { - int stdinfd =3D -1; - int stdoutfd =3D -1; - int nextpid; - - VIR_FORCE_CLOSE(statuspipe[0]); - - if ((stdinfd =3D open("/dev/null", O_RDONLY)) < 0) - goto cleanup; - if ((stdoutfd =3D open("/dev/null", O_WRONLY)) < 0) - goto cleanup; - if (dup2(stdinfd, STDIN_FILENO) !=3D STDIN_FILENO) - goto cleanup; - if (dup2(stdoutfd, STDOUT_FILENO) !=3D STDOUT_FILENO) - goto cleanup; - if (dup2(stdoutfd, STDERR_FILENO) !=3D STDERR_FILENO) - goto cleanup; - if (VIR_CLOSE(stdinfd) < 0) - goto cleanup; - if (VIR_CLOSE(stdoutfd) < 0) - goto cleanup; - - if (setsid() < 0) - goto cleanup; - - nextpid =3D fork(); - switch (nextpid) { - case 0: - return statuspipe[1]; - case -1: - return -1; - default: - _exit(0); - } - - cleanup: - VIR_FORCE_CLOSE(stdoutfd); - VIR_FORCE_CLOSE(stdinfd); - return -1; - - } - - case -1: - return -1; - - default: - { - int got, exitstatus =3D 0; - int ret; - char status; - - VIR_FORCE_CLOSE(statuspipe[1]); - - /* We wait to make sure the first child forked successfully */ - if ((got =3D waitpid(pid, &exitstatus, 0)) < 0 || - got !=3D pid || - exitstatus !=3D 0) { - return -1; - } - - /* Now block until the second child initializes successfully */ - again: - ret =3D read(statuspipe[0], &status, 1); - if (ret =3D=3D -1 && errno =3D=3D EINTR) - goto again; - - if (ret =3D=3D 1 && status !=3D 0) { - fprintf(stderr, - _("%s: error: %s. Check /var/log/messages or run w= ithout " - "--daemon for more info.\n"), argv0, - virDaemonErrTypeToString(status)); - } - _exit(ret =3D=3D 1 && status =3D=3D 0 ? 0 : 1); - } - } -} - - -static int -virLogDaemonUnixSocketPaths(bool privileged, - char **sockfile, - char **adminSockfile) -{ - if (privileged) { - *sockfile =3D g_strdup(RUNSTATEDIR "/libvirt/virtlogd-sock"); - *adminSockfile =3D g_strdup(RUNSTATEDIR "/libvirt/virtlogd-admin-s= ock"); - } else { - g_autofree char *rundir =3D NULL; - mode_t old_umask; - - rundir =3D virGetUserRuntimeDirectory(); - - old_umask =3D umask(077); - if (virFileMakePath(rundir) < 0) { - umask(old_umask); - return -1; - } - umask(old_umask); - - *sockfile =3D g_strdup_printf("%s/virtlogd-sock", rundir); - *adminSockfile =3D g_strdup_printf("%s/virtlogd-admin-sock", rundi= r); - } - return 0; -} - - static void virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED, virErrorPtr err G_GNUC_UNUSED) @@ -419,50 +273,6 @@ virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED, } =20 =20 -static void -virLogDaemonSetupLogging(virLogDaemonConfigPtr config, - bool privileged, - bool verbose, - bool godaemon) -{ - virLogReset(); - - /* - * Libvirtd's order of precedence is: - * cmdline > environment > config - * - * Given the precedence, we must process the variables in the opposite - * order, each one overriding the previous. - */ - if (config->log_level !=3D 0) - virLogSetDefaultPriority(config->log_level); - - /* In case the config is empty, both filters and outputs will become e= mpty, - * however we can't start with empty outputs, thus we'll need to defin= e and - * setup a default one. - */ - ignore_value(virLogSetFilters(config->log_filters)); - ignore_value(virLogSetOutputs(config->log_outputs)); - - /* If there are some environment variables defined, use those instead = */ - virLogSetFromEnv(); - - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - - /* Define the default output. This is only applied if there was no set= ting - * from either the config or the environment. - */ - virLogSetDefaultOutput("virtlogd", godaemon, privileged); - - if (virLogGetNbOutputs() =3D=3D 0) - virLogSetOutputs(virLogGetDefaultOutput()); -} - - =20 /* Display version information. */ static void @@ -951,7 +761,13 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } =20 - virLogDaemonSetupLogging(config, privileged, verbose, godaemon); + virDaemonSetupLogging("virtlogd", + config->log_level, + config->log_filters, + config->log_outputs, + privileged, + verbose, + godaemon); =20 if (!pid_file && virPidFileConstructPath(privileged, @@ -963,9 +779,12 @@ int main(int argc, char **argv) { } VIR_DEBUG("Decided on pid file path '%s'", NULLSTR(pid_file)); =20 - if (virLogDaemonUnixSocketPaths(privileged, - &sock_file, - &admin_sock_file) < 0) { + if (virDaemonUnixSocketPaths("virtlogd", + privileged, + NULL, + &sock_file, + NULL, + &admin_sock_file) < 0) { VIR_ERROR(_("Can't determine socket paths")); exit(EXIT_FAILURE); } @@ -995,7 +814,7 @@ int main(int argc, char **argv) { if (virFileMakePath(run_dir) < 0) { VIR_ERROR(_("unable to create rundir %s: %s"), run_dir, g_strerror(errno)); - ret =3D VIR_LOG_DAEMON_ERR_RUNDIR; + ret =3D VIR_DAEMON_ERR_RUNDIR; umask(old_umask); goto cleanup; } @@ -1006,7 +825,7 @@ int main(int argc, char **argv) { &pid_file_fd, privileged, config)) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } =20 @@ -1028,7 +847,7 @@ int main(int argc, char **argv) { goto cleanup; } =20 - if ((statuswrite =3D virLogDaemonForkIntoBackground(argv[0])) = < 0) { + if ((statuswrite =3D virDaemonForkIntoBackground(argv[0])) < 0= ) { VIR_ERROR(_("Failed to fork as daemon: %s"), g_strerror(errno)); goto cleanup; @@ -1037,19 +856,19 @@ int main(int argc, char **argv) { =20 /* If we have a pidfile set, claim it now, exiting if already take= n */ if ((pid_file_fd =3D virPidFileAcquirePath(pid_file, false, getpid= ())) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_PIDFILE; + ret =3D VIR_DAEMON_ERR_PIDFILE; goto cleanup; } =20 if (!(logDaemon =3D virLogDaemonNew(config, privileged))) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } =20 if (virSystemdGetActivation(actmap, G_N_ELEMENTS(actmap), &act) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_NETWORK; + ret =3D VIR_DAEMON_ERR_NETWORK; goto cleanup; } =20 @@ -1061,7 +880,7 @@ int main(int argc, char **argv) { sock_file, 0700, 0, 0, NULL, false, 0, 1) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_NETWORK; + ret =3D VIR_DAEMON_ERR_NETWORK; goto cleanup; } if (virNetServerAddServiceUNIX(adminSrv, @@ -1069,13 +888,13 @@ int main(int argc, char **argv) { admin_sock_file, 0700, 0, 0, NULL, false, 0, 1) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_NETWORK; + ret =3D VIR_DAEMON_ERR_NETWORK; goto cleanup; } =20 if (act && virSystemdActivationComplete(act) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_NETWORK; + ret =3D VIR_DAEMON_ERR_NETWORK; goto cleanup; } } else { @@ -1093,7 +912,7 @@ int main(int argc, char **argv) { } =20 if ((virLogDaemonSetupSignals(logDaemon->dmn)) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_SIGNAL; + ret =3D VIR_DAEMON_ERR_SIGNAL; goto cleanup; } =20 @@ -1101,11 +920,11 @@ int main(int argc, char **argv) { VIR_LOG_MANAGER_PROTOCOL_PRO= GRAM_VERSION, virLogManagerProtocolProcs, virLogManagerProtocolNProcs)= )) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } if (virNetServerAddProgram(logSrv, logProgram) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } =20 @@ -1114,11 +933,11 @@ int main(int argc, char **argv) { ADMIN_PROTOCOL_VERSION, adminProcs, adminNProcs))) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } if (virNetServerAddProgram(adminSrv, adminProgram) < 0) { - ret =3D VIR_LOG_DAEMON_ERR_INIT; + ret =3D VIR_DAEMON_ERR_INIT; goto cleanup; } } @@ -1147,7 +966,7 @@ int main(int argc, char **argv) { virLogDaemonPreExecRestart(state_file, logDaemon->dmn, argv) < 0) - ret =3D VIR_LOG_DAEMON_ERR_REEXEC; + ret =3D VIR_DAEMON_ERR_REEXEC; else ret =3D 0; =20 --=20 2.25.1