git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <novalis@novalis.org>
To: git@vger.kernel.org, pclouds@gmail.com, kmaggg@gmail.com
Cc: David Turner <dturner@twopensource.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v14 08/21] index-helper: log warnings
Date: Sun,  3 Jul 2016 03:58:00 -0400	[thread overview]
Message-ID: <1467532693-20017-9-git-send-email-novalis@novalis.org> (raw)
In-Reply-To: <1467532693-20017-1-git-send-email-novalis@novalis.org>

From: David Turner <dturner@twopensource.com>

Instead of writing warnings to stderr, write them to a log.  Later, we'll
probably be daemonized, so writing to stderr will be pointless.

Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/git-index-helper.txt |  3 +++
 index-helper.c                     | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Documentation/git-index-helper.txt b/Documentation/git-index-helper.txt
index 228b1df..3d2c829 100644
--- a/Documentation/git-index-helper.txt
+++ b/Documentation/git-index-helper.txt
@@ -57,6 +57,9 @@ command. The following commands are used to control the daemon:
 
 All commands and replies are in pkt-line format.
 
+In the event of an error, messages may be written to
+$GIT_DIR/index-helper.log.
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/index-helper.c b/index-helper.c
index eca8ae9..1b79f1d 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -103,7 +103,8 @@ static void share_index(struct index_state *istate, struct shm *is)
 	if (shared_mmap_create(istate->mmap_size, &new_mmap,
 			       git_path("shm-index-%s",
 					sha1_to_hex(istate->sha1))) < 0) {
-		die("Failed to create shm-index file");
+		warning("Failed to create shm-index file");
+		exit(1);
 	}
 
 
@@ -302,8 +303,17 @@ int main(int argc, char **argv)
 		die("--exit-after value must be less than %d seconds",
 		    INT_MAX / 1000);
 
+	if (detach) {
+		FILE *fp = fopen(git_path("index-helper.log"), "a");
+		if (!fp)
+			die("failed to open %s for writing",
+			    git_path("index-helper.log"));
+		set_error_handle(fp);
+	}
+
 	if (detach && daemonize(&daemonized))
 		die_errno(_("unable to detach"));
+
 	loop(fd, idle_in_seconds);
 
 	close(fd);
-- 
1.9.1


  parent reply	other threads:[~2016-07-03  8:01 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-03  7:57 [PATCH v14 00/21] index-helper/watchman David Turner
2016-07-03  7:57 ` [PATCH v14 01/21] read-cache: allow to keep mmap'd memory after reading David Turner
2016-07-03  7:57 ` [PATCH v14 02/21] pkt-line: add gentle version of packet_write David Turner
2016-07-03  7:57 ` [PATCH v14 03/21] unix-socket.c: add stub implementation when unix sockets are not supported David Turner
2016-07-03  7:57 ` [PATCH v14 04/21] index-helper: new daemon for caching index and related stuff David Turner
2016-07-03  7:57 ` [PATCH v14 05/21] index-helper: add --strict David Turner
2016-07-03  7:57 ` [PATCH v14 06/21] daemonize(): set a flag before exiting the main process David Turner
2016-07-03  7:57 ` [PATCH v14 07/21] index-helper: add --detach David Turner
2016-07-03  7:58 ` David Turner [this message]
2016-07-03  7:58 ` [PATCH v14 09/21] read-cache: add watchman 'WAMA' extension David Turner
2016-07-03  7:58 ` [PATCH v14 10/21] watchman: support watchman to reduce index refresh cost David Turner
2016-07-03  7:58 ` [PATCH v14 11/21] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-07-03  7:58 ` [PATCH v14 12/21] update-index: enable/disable watchman support David Turner
2016-07-03  7:58 ` [PATCH v14 13/21] unpack-trees: preserve index extensions David Turner
2016-07-03  7:58 ` [PATCH v14 14/21] watchman: add a config option to enable the extension David Turner
2016-07-03  7:58 ` [PATCH v14 15/21] index-helper: kill mode David Turner
2016-07-06  8:20   ` Johannes Schindelin
2016-07-06 15:33     ` Duy Nguyen
2016-07-03  7:58 ` [PATCH v14 16/21] index-helper: don't run if already running David Turner
2016-07-03  7:58 ` [PATCH v14 17/21] index-helper: autorun mode David Turner
2016-07-03  7:58 ` [PATCH v14 18/21] index-helper: optionally automatically run David Turner
2016-07-03  7:58 ` [PATCH v14 19/21] trace: measure where the time is spent in the index-heavy operations David Turner
2016-07-03 11:51 ` [PATCH v14 00/21] index-helper/watchman Johannes Schindelin
2016-07-04  6:40   ` Johannes Schindelin
2016-07-06 18:11 ` Junio C Hamano
2016-07-12 18:24 ` Duy Nguyen
2016-07-13 21:59   ` David Turner
2016-07-14 15:56     ` Duy Nguyen
2016-07-14 15:58       ` Duy Nguyen
2016-07-15  1:20       ` Ben Peart

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=1467532693-20017-9-git-send-email-novalis@novalis.org \
    --to=novalis@novalis.org \
    --cc=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=kmaggg@gmail.com \
    --cc=pclouds@gmail.com \
    /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).