From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, pclouds@gmail.com
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH v10 08/20] index-helper: log warnings
Date: Thu, 12 May 2016 16:20:03 -0400 [thread overview]
Message-ID: <1463084415-19826-9-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1463084415-19826-1-git-send-email-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>
---
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 f853960..e144752 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 terminated by a NUL byte.
+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 65abfd0..a3a9b00 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -95,7 +95,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);
}
@@ -321,8 +322,17 @@ int main(int argc, char **argv)
if (fd < 0)
die_errno(_("could not set up index-helper socket"));
+ 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);
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-05-12 20:20 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 20:19 [PATCH v10 00/20] index-helper/watchman David Turner
2016-05-12 20:19 ` [PATCH v10 01/20] read-cache.c: fix constness of verify_hdr() David Turner
2016-05-12 20:19 ` [PATCH v10 02/20] read-cache: allow to keep mmap'd memory after reading David Turner
2016-05-12 20:19 ` [PATCH v10 03/20] pkt-line: add gentle version of packet_write David Turner
2016-05-12 21:14 ` Junio C Hamano
2016-05-12 20:19 ` [PATCH v10 04/20] index-helper: new daemon for caching index and related stuff David Turner
2016-05-12 20:20 ` [PATCH v10 05/20] index-helper: add --strict David Turner
2016-05-12 20:20 ` [PATCH v10 06/20] daemonize(): set a flag before exiting the main process David Turner
2016-05-12 20:20 ` [PATCH v10 07/20] index-helper: add --detach David Turner
2016-05-12 20:20 ` David Turner [this message]
2016-05-12 20:20 ` [PATCH v10 09/20] read-cache: add watchman 'WAMA' extension David Turner
2016-05-12 20:20 ` [PATCH v10 10/20] watchman: support watchman to reduce index refresh cost David Turner
2016-05-12 20:20 ` [PATCH v10 11/20] index-helper: use watchman to avoid refreshing index with lstat() David Turner
2016-05-12 23:10 ` Ramsay Jones
2016-05-13 17:47 ` David Turner
2016-05-13 18:27 ` [PATCH] " David Turner
2016-05-13 20:17 ` Ramsay Jones
2016-05-13 21:16 ` [PATCH v10 ter] " David Turner
2016-05-12 20:20 ` [PATCH v10 12/20] update-index: enable/disable watchman support David Turner
2016-05-12 20:20 ` [PATCH v10 13/20] unpack-trees: preserve index extensions David Turner
2016-05-12 20:20 ` [PATCH v10 14/20] watchman: add a config option to enable the extension David Turner
2016-05-12 20:20 ` [PATCH v10 15/20] index-helper: kill mode David Turner
2016-05-12 20:20 ` [PATCH v10 16/20] index-helper: don't run if already running David Turner
2016-05-12 20:20 ` [PATCH v10 17/20] index-helper: autorun mode David Turner
2016-05-12 20:20 ` [PATCH v10 18/20] index-helper: optionally automatically run David Turner
2016-05-12 20:20 ` [PATCH v10 19/20] trace: measure where the time is spent in the index-heavy operations David Turner
2016-05-12 20:20 ` [PATCH v10 20/20] untracked-cache: config option David Turner
2016-05-15 9:43 ` Duy Nguyen
2016-05-16 18:03 ` David Turner
2016-05-14 13:14 ` [PATCH v10 00/20] index-helper/watchman Dennis Kaarsemaker
2016-05-19 19:08 ` David Turner
2016-05-19 20:11 ` Junio C Hamano
2016-05-19 20:30 ` David Turner
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=1463084415-19826-9-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--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).