qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 3/4] qemu-nbd: report errors to syslog when daemonized
Date: Fri, 28 Oct 2011 12:17:56 +0200	[thread overview]
Message-ID: <1319797077-25441-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1319797077-25441-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-nbd.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 573bf3d..5031158 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -30,6 +30,7 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <signal.h>
+#include <syslog.h>
 #include <libgen.h>
 
 #define SOCKET_PATH    "/var/lock/qemu-nbd-%s"
@@ -37,6 +38,7 @@
 #define NBD_BUFFER_SIZE (1024*1024)
 
 static int verbose;
+static int daemonized;
 
 static void usage(const char *name)
 {
@@ -87,7 +89,11 @@ static void err(int status, const char *format, ...)
     if (vasprintf(&s, format, ap) == -1) {
 	abort();
     }
-    fprintf(stderr, "qemu-nbd: %s: %s\n", s, msg);
+    if (daemonized) {
+        syslog(LOG_ERR, "%s: %s", s, msg);
+    } else {
+        fprintf(stderr, "qemu-nbd: %s: %s\n", s, msg);
+    }
     free(s);
     exit(status);
 }
@@ -101,7 +107,11 @@ static void errx(int status, const char *format, ...)
     if (vasprintf(&s, format, ap) == -1) {
         abort();
     }
-    fprintf(stderr, "qemu-nbd: %s\n", s);
+    if (daemonized) {
+        syslog(LOG_ERR, "%s", s);
+    } else {
+        fprintf(stderr, "qemu-nbd: %s\n", s);
+    }
     free(s);
     exit(status);
 }
@@ -387,9 +397,11 @@ int main(int argc, char **argv)
 
         if (!verbose) {
             /* detach client and server */
+            openlog("qemu-nbd", LOG_PID, LOG_USER);
             if (qemu_daemon(0, 0) == -1) {
                 err(EXIT_FAILURE, "Failed to daemonize");
             }
+            daemonized = 1;
         }
 
         if (socket == NULL) {
-- 
1.7.6.4

  parent reply	other threads:[~2011-10-28 10:18 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-28 10:17 [Qemu-devel] [PATCH 0/4] fix qemu-nbd -c Paolo Bonzini
2011-10-28 10:17 ` [Qemu-devel] [PATCH 1/4] qemu-nbd: exit if the child exits before a socket connection is established Paolo Bonzini
2011-10-28 10:17 ` [Qemu-devel] [PATCH 2/4] qemu-nbd: include our own err/errx implementation Paolo Bonzini
2011-10-28 10:17 ` Paolo Bonzini [this message]
2011-10-28 10:17 ` [Qemu-devel] [PATCH 4/4] qemu-nbd: do not start the block layer in the parent Paolo Bonzini
2011-10-28 11:56   ` Pierre Riteau
2011-10-28 11:57     ` Paolo Bonzini
2011-10-28 12:16       ` Pierre Riteau
2011-10-28 12:17         ` Paolo Bonzini
2011-11-04  9:46           ` Paolo Bonzini
2011-11-04 10:31             ` Kevin Wolf
2011-11-04 11:10               ` Paolo Bonzini
2011-11-04 11:22                 ` Kevin Wolf
2011-11-04 11:25                   ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1319797077-25441-4-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).