summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2010-11-04 02:35:17 +0100
committerJunio C Hamano <gitster@pobox.com>2010-11-04 16:53:51 -0700
commit48cfaea10879790ba6d2c8b566a0df75c411672d (patch)
tree1214e635ff6d4f22062648e2251eee8e31972766 /daemon.c
parent30e1560230bc0154230b315a5f7c4f46870f9c81 (diff)
downloadgit-48cfaea10879790ba6d2c8b566a0df75c411672d.tar.gz
daemon: use full buffered mode for stderr
Windows doesn't support line buffered mode for file streams, so let's just use full buffered mode with a big buffer ("4096 should be enough for everyone") and add explicit flushing. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/daemon.c b/daemon.c
index 40595933be..941c095df4 100644
--- a/daemon.c
+++ b/daemon.c
@@ -67,12 +67,14 @@ static void logreport(int priority, const char *err, va_list params)
syslog(priority, "%s", buf);
} else {
/*
- * Since stderr is set to linebuffered mode, the
+ * Since stderr is set to buffered mode, the
* logging of different processes will not overlap
+ * unless they overflow the (rather big) buffers.
*/
fprintf(stderr, "[%"PRIuMAX"] ", (uintmax_t)getpid());
vfprintf(stderr, err, params);
fputc('\n', stderr);
+ fflush(stderr);
}
}
@@ -1117,7 +1119,7 @@ int main(int argc, char **argv)
set_die_routine(daemon_die);
} else
/* avoid splitting a message in the middle */
- setvbuf(stderr, NULL, _IOLBF, 0);
+ setvbuf(stderr, NULL, _IOFBF, 4096);
if (inetd_mode && (group_name || user_name))
die("--user and --group are incompatible with --inetd");