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 <dtur...@twopensource.com>
---
Documentation/git-index-helper.txt | 3 +++
index-helper.c | 32 ++++++++++++++++++++++++++++----
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-index-helper.txt
b/Documentation/git-index-helper.txt
index 1f92c89..9c2f5eb 100644
--- a/Documentation/git-index-helper.txt
+++ b/Documentation/git-index-helper.txt
@@ -54,6 +54,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 bc7e110..21fb431 100644
--- a/index-helper.c
+++ b/index-helper.c
@@ -19,6 +19,29 @@ static struct shm shm_index;
static struct shm shm_base_index;
static int to_verify = 1;
+static void log_warning(const char *warning, ...)
+{
+ va_list ap;
+ FILE *fp;
+
+ fp = fopen(git_path("index-helper.log"), "a");
+ if (!fp)
+ /*
+ * Probably nobody will see this, but it's the best
+ * we can do.
+ */
+ die("Failed to open log for warnings");
+
+ fprintf(fp, "%"PRIuMAX"\t", (uintmax_t)time(NULL));
+
+ va_start(ap, warning);
+ vfprintf(fp, warning, ap);
+ va_end(ap);
+
+ fputc('\n', fp);
+ fclose(fp);
+}
+
static void release_index_shm(struct shm *is)
{
if (!is->shm)
@@ -93,7 +116,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");
+ log_warning("Failed to create shm-index file");
+ exit(1);
}
@@ -135,7 +159,7 @@ static int verify_shm(void)
ce = istate.cache[i];
if (ce->ce_namelen != base->ce_namelen ||
strcmp(ce->name, base->name)) {
- warning("mismatch at entry %d", i);
+ log_warning("mismatch at entry %d", i);
break;
}
ce_flags = ce->ce_flags;
@@ -149,7 +173,7 @@ static int verify_shm(void)
ce->ce_flags = ce_flags;
base->ce_flags = base_flags;
if (ret) {
- warning("mismatch at entry %d", i);
+ log_warning("mismatch at entry %d", i);
break;
}
}
@@ -255,7 +279,7 @@ static void loop(int fd, int idle_in_seconds)
* alive, nothing to do.
*/
} else {
- warning("BUG: Bogus command %s", buf);
+ log_warning("BUG: Bogus command %s", buf);
}
} else {
/*
--
2.4.2.767.g62658d5-twtrsrc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
