summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorStephen R. van den Berg <srb@cuci.nl>2008-08-14 18:02:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-18 00:43:53 (GMT)
commitdf0daf8ac0fce4bb98d5aff9295535a1606d2fad (patch)
treea7e69be7baf7f1dc2d228654223e575024d4cbac /daemon.c
parent2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0 (diff)
downloadgit-df0daf8ac0fce4bb98d5aff9295535a1606d2fad.zip
git-df0daf8ac0fce4bb98d5aff9295535a1606d2fad.tar.gz
git-df0daf8ac0fce4bb98d5aff9295535a1606d2fad.tar.bz2
git-daemon: call logerror() instead of error()
Use logerror(), not error(), so that the messages won't be lost, especially when running the daemon with its log sent to the syslog facility. Signed-off-by: Stephen R. van den Berg <srb@cuci.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/daemon.c b/daemon.c
index 8dcde73..93e1106 100644
--- a/daemon.c
+++ b/daemon.c
@@ -836,7 +836,7 @@ static int socksetup(char *listen_addr, int listen_port, int **socklist_p)
if (sockfd < 0)
continue;
if (sockfd >= FD_SETSIZE) {
- error("too large socket descriptor.");
+ logerror("Socket descriptor too large");
close(sockfd);
continue;
}
@@ -955,7 +955,7 @@ static int service_loop(int socknum, int *socklist)
if (poll(pfd, socknum + 1, -1) < 0) {
if (errno != EINTR) {
- error("poll failed, resuming: %s",
+ logerror("Poll failed, resuming: %s",
strerror(errno));
sleep(1);
}