85/106829c8542f9d424d08f273b9b5e670b6912f

   1 Return-Path: <davrieb@liegesta.at>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id C3655429E28\r
   6         for <notmuch@notmuchmail.org>; Sat,  5 Nov 2011 22:34:47 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: 0\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
  12         autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id NvsYV8y2voVh for <notmuch@notmuchmail.org>;\r
  16         Sat,  5 Nov 2011 22:34:47 -0700 (PDT)\r
  17 Received: from plum.liegesta.at (plum.liegesta.at [83.169.17.237])\r
  18         by olra.theworths.org (Postfix) with ESMTP id DF6B2431FB6\r
  19         for <notmuch@notmuchmail.org>; Sat,  5 Nov 2011 22:34:46 -0700 (PDT)\r
  20 Received: from ambiguous-mid.liegesta.at (mk046207255003.a1.net\r
  21  [46.207.255.3])        (Authenticated sender: davrieb) by plum.liegesta.at (Postfix)\r
  22  with ESMTPA id 7A2F127B8255;   Sun,  6 Nov 2011 06:34:45 +0100 (CET)\r
  23 Received: by ambiguous-mid.liegesta.at (Postfix, from userid 1000)\r
  24         id 8AACE20707; Sun,  6 Nov 2011 06:34:43 +0100 (CET)\r
  25 From: David Riebenbauer <davrieb@liegesta.at>\r
  26 To: Notmuch Mailing List <notmuch@notmuchmail.org>\r
  27 Subject: [PATCH 2/2] notmuch-deliver: in save_splice() log failures as debug.\r
  28 Date: Sun,  6 Nov 2011 06:34:28 +0100\r
  29 Message-Id: <1320557668-2314-2-git-send-email-davrieb@liegesta.at>\r
  30 X-Mailer: git-send-email 1.7.7.1\r
  31 In-Reply-To: <1320557668-2314-1-git-send-email-davrieb@liegesta.at>\r
  32 References: <1320557668-2314-1-git-send-email-davrieb@liegesta.at>\r
  33 X-BeenThere: notmuch@notmuchmail.org\r
  34 X-Mailman-Version: 2.1.13\r
  35 Precedence: list\r
  36 List-Id: "Use and development of the notmuch mail system."\r
  37         <notmuch.notmuchmail.org>\r
  38 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  39         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  40 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  41 List-Post: <mailto:notmuch@notmuchmail.org>\r
  42 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  43 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  44         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  45 X-List-Received-Date: Sun, 06 Nov 2011 05:34:48 -0000\r
  46 \r
  47 If we don't exit if splice fails then we should just log failures as\r
  48 debug instead of critical.\r
  49 ---\r
  50  contrib/notmuch-deliver/src/main.c |    8 ++++----\r
  51  1 files changed, 4 insertions(+), 4 deletions(-)\r
  52 \r
  53 diff --git a/contrib/notmuch-deliver/src/main.c b/contrib/notmuch-deliver/src/main.c\r
  54 index 8423d91..39cd804 100644\r
  55 --- a/contrib/notmuch-deliver/src/main.c\r
  56 +++ b/contrib/notmuch-deliver/src/main.c\r
  57 @@ -148,7 +148,7 @@ save_splice(int fdin, int fdout)\r
  58         int ret, written, pfd[2];\r
  59  \r
  60         if (pipe(pfd) < 0) {\r
  61 -               g_critical("Failed to create pipe: %s", g_strerror(errno));\r
  62 +               g_debug("Failed to create pipe: %s", g_strerror(errno));\r
  63                 return EX_IOERR;\r
  64         }\r
  65  \r
  66 @@ -157,7 +157,7 @@ save_splice(int fdin, int fdout)\r
  67                 if (!ret)\r
  68                         break;\r
  69                 if (ret < 0) {\r
  70 -                       g_critical("Splicing data from standard input failed: %s",\r
  71 +                       g_debug("Splicing data from standard input failed: %s",\r
  72                                 g_strerror(errno));\r
  73                         close(pfd[0]);\r
  74                         close(pfd[1]);\r
  75 @@ -167,13 +167,13 @@ save_splice(int fdin, int fdout)\r
  76                 do {\r
  77                         written = splice(pfd[0], NULL, fdout, NULL, ret, 0);\r
  78                         if (!written) {\r
  79 -                               g_critical("Splicing data to temporary file failed: internal error");\r
  80 +                               g_debug("Splicing data to temporary file failed: internal error");\r
  81                                 close(pfd[0]);\r
  82                                 close(pfd[1]);\r
  83                                 return EX_IOERR;\r
  84                         }\r
  85                         if (written < 0) {\r
  86 -                               g_critical("Splicing data to temporary file failed: %s",\r
  87 +                               g_debug("Splicing data to temporary file failed: %s",\r
  88                                         g_strerror(errno));\r
  89                                 close(pfd[0]);\r
  90                                 close(pfd[1]);\r
  91 -- \r
  92 1.7.7.1\r
  93 \r