summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-09-24 14:13:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-24 18:20:45 (GMT)
commit9048fe1c50499d562dcf73094f173b12bdb084c4 (patch)
treef1a6452c40eacc7d384eb3e5bd5407d4b5dbc6bd /daemon.c
parentb5cf3c8b7767e5f2c8b0df718ef91ccfc36c61fe (diff)
downloadgit-9048fe1c50499d562dcf73094f173b12bdb084c4.zip
git-9048fe1c50499d562dcf73094f173b12bdb084c4.tar.gz
git-9048fe1c50499d562dcf73094f173b12bdb084c4.tar.bz2
[PATCH] git-daemon --syslog to log through syslog
Well, this makes it even more clear that we need the packet reader and friends to use the daemon logging code. :/ Therefore, we at least indicate in the "Disconnect" log message if the child process exitted with an error code or not. Idea by Linus. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'daemon.c')
-rw-r--r--daemon.c34
1 files changed, 27 insertions, 7 deletions
diff --git a/daemon.c b/daemon.c
index b1fd60d..5547e64 100644
--- a/daemon.c
+++ b/daemon.c
@@ -7,13 +7,15 @@
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#include <syslog.h>
+static int log_syslog;
static int verbose;
-static const char daemon_usage[] = "git-daemon [--verbose] [--inetd | --port=n]";
+static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n]";
-static void logreport(const char *err, va_list params)
+static void logreport(int priority, const char *err, va_list params)
{
/* We should do a single write so that it is atomic and output
* of several processes do not get intermingled. */
@@ -27,6 +29,11 @@ static void logreport(const char *err, va_list params)
maxlen = sizeof(buf) - buflen - 1; /* -1 for our own LF */
msglen = vsnprintf(buf + buflen, maxlen, err, params);
+ if (log_syslog) {
+ syslog(priority, "%s", buf);
+ return;
+ }
+
/* maxlen counted our own LF but also counts space given to
* vsnprintf for the terminating NUL. We want to make sure that
* we have space for our own LF and NUL after the "meat" of the
@@ -48,7 +55,7 @@ void logerror(const char *err, ...)
{
va_list params;
va_start(params, err);
- logreport(err, params);
+ logreport(LOG_ERR, err, params);
va_end(params);
}
@@ -58,7 +65,7 @@ void lognotice(const char *err, ...)
if (!verbose)
return;
va_start(params, err);
- logreport(err, params);
+ logreport(LOG_INFO, err, params);
va_end(params);
}
@@ -285,15 +292,23 @@ static void handle(int incoming, struct sockaddr *addr, int addrlen)
static void child_handler(int signo)
{
for (;;) {
- pid_t pid = waitpid(-1, NULL, WNOHANG);
+ int status;
+ pid_t pid = waitpid(-1, &status, WNOHANG);
if (pid > 0) {
unsigned reaped = children_reaped;
dead_child[reaped % MAX_CHILDREN] = pid;
children_reaped = reaped + 1;
/* XXX: Custom logging, since we don't wanna getpid() */
- if (verbose)
- fprintf(stderr, "[%d] Disconnected\n", pid);
+ if (verbose) {
+ char *dead = "";
+ if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
+ dead = " (with error)";
+ if (log_syslog)
+ syslog(LOG_INFO, "[%d] Disconnected%s", pid, dead);
+ else
+ fprintf(stderr, "[%d] Disconnected%s\n", pid, dead);
+ }
continue;
}
break;
@@ -435,6 +450,11 @@ int main(int argc, char **argv)
verbose = 1;
continue;
}
+ if (!strcmp(arg, "--syslog")) {
+ log_syslog = 1;
+ openlog("git-daemon", 0, LOG_DAEMON);
+ continue;
+ }
usage(daemon_usage);
}