From: Erik Faye-Lund <kusmabite@googlemail.com>
To: msysgit@googlegroups.com
Cc: git@vger.kernel.org, dotzenlabs@gmail.com,
Erik Faye-Lund <kusmabite@gmail.com>
Subject: [PATCH/RFC 03/11] mingw: implement syslog
Date: Thu, 26 Nov 2009 00:44:12 +0000 [thread overview]
Message-ID: <1259196260-3064-4-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1259196260-3064-3-git-send-email-kusmabite@gmail.com>
From: Mike Pape <dotzenlabs@gmail.com>
Syslog does not usually exist on Windows, so we implement our own
using Window's ReportEvent mechanism.
Signed-off-by: Mike Pape <dotzenlabs@gmail.com>
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
compat/mingw.h | 15 +++++++++++++++
daemon.c | 2 --
git-compat-util.h | 1 +
4 files changed, 67 insertions(+), 2 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index 458021b..68116ac 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1255,6 +1255,57 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out)
return 0;
}
+static HANDLE ms_eventlog;
+
+void openlog(const char *ident, int logopt, int facility) {
+ if (ms_eventlog)
+ return;
+ ms_eventlog = RegisterEventSourceA(NULL, ident);
+}
+
+void syslog(int priority, const char *fmt, ...) {
+ struct strbuf msg;
+ va_list va;
+ WORD logtype;
+
+ strbuf_init(&msg, 0);
+ va_start(va, fmt);
+ strbuf_vaddf(&msg, fmt, va);
+ va_end(va);
+
+ switch (priority) {
+ case LOG_EMERG:
+ case LOG_ALERT:
+ case LOG_CRIT:
+ case LOG_ERR:
+ logtype = EVENTLOG_ERROR_TYPE;
+ break;
+
+ case LOG_WARNING:
+ logtype = EVENTLOG_WARNING_TYPE;
+ break;
+
+ case LOG_NOTICE:
+ case LOG_INFO:
+ case LOG_DEBUG:
+ default:
+ logtype = EVENTLOG_INFORMATION_TYPE;
+ break;
+ }
+
+ ReportEventA(ms_eventlog,
+ logtype,
+ (WORD)NULL,
+ (DWORD)NULL,
+ NULL,
+ 1,
+ 0,
+ (const char **)&msg.buf,
+ NULL);
+
+ strbuf_release(&msg);
+}
+
#undef signal
sig_handler_t mingw_signal(int sig, sig_handler_t handler)
{
diff --git a/compat/mingw.h b/compat/mingw.h
index f362f61..576b1a1 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -37,6 +37,19 @@ typedef int socklen_t;
#define EAFNOSUPPORT WSAEAFNOSUPPORT
#define ECONNABORTED WSAECONNABORTED
+#define LOG_PID 0x01
+
+#define LOG_EMERG 0
+#define LOG_ALERT 1
+#define LOG_CRIT 2
+#define LOG_ERR 3
+#define LOG_WARNING 4
+#define LOG_NOTICE 5
+#define LOG_INFO 6
+#define LOG_DEBUG 7
+
+#define LOG_DAEMON (3<<3)
+
struct passwd {
char *pw_name;
char *pw_gecos;
@@ -157,6 +170,8 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out);
int link(const char *oldpath, const char *newpath);
int symlink(const char *oldpath, const char *newpath);
int readlink(const char *path, char *buf, size_t bufsiz);
+void openlog(const char *ident, int logopt, int facility);
+void syslog(int priority, const char *fmt, ...);
/*
* replacements of existing functions
diff --git a/daemon.c b/daemon.c
index 1b5ada6..07d7356 100644
--- a/daemon.c
+++ b/daemon.c
@@ -4,8 +4,6 @@
#include "run-command.h"
#include "strbuf.h"
-#include <syslog.h>
-
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 256
#endif
diff --git a/git-compat-util.h b/git-compat-util.h
index ef60803..33a8e33 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -105,6 +105,7 @@
#include <netdb.h>
#include <pwd.h>
#include <inttypes.h>
+#include <syslog.h>
#if defined(__CYGWIN__)
#undef _XOPEN_SOURCE
#include <grp.h>
--
1.6.5.rc2.7.g4f8d3
next prev parent reply other threads:[~2009-11-26 0:44 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 0:44 [PATCH/RFC 00/11] daemon-win32 Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 01/11] mingw: add network-wrappers for daemon Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 02/11] strbuf: add non-variadic function strbuf_vaddf() Erik Faye-Lund
2009-11-26 0:44 ` Erik Faye-Lund [this message]
2009-11-26 0:44 ` [PATCH/RFC 04/11] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 05/11] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 06/11] run-command: add kill_async() and is_async_alive() Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 07/11] run-command: support input-fd Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 08/11] daemon: use explicit file descriptor Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 09/11] daemon: use run-command api for async serving Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 10/11] daemon: use full buffered mode for stderr Erik Faye-Lund
2009-11-26 0:44 ` [PATCH/RFC 11/11] mingw: compile git-daemon Erik Faye-Lund
2009-11-27 21:17 ` [msysGit] " Johannes Sixt
2009-11-27 20:59 ` [msysGit] [PATCH/RFC 09/11] daemon: use run-command api for async serving Johannes Sixt
2009-12-02 15:45 ` Erik Faye-Lund
2009-12-02 19:12 ` Johannes Sixt
2009-12-08 13:36 ` Erik Faye-Lund
2009-11-26 22:03 ` [msysGit] [PATCH/RFC 08/11] daemon: use explicit file descriptor Johannes Sixt
2009-11-27 14:23 ` Erik Faye-Lund
2009-11-27 15:46 ` Erik Faye-Lund
2009-11-27 20:23 ` Johannes Sixt
2009-11-27 20:28 ` Johannes Sixt
2009-12-08 13:38 ` Erik Faye-Lund
2009-11-26 21:53 ` [msysGit] [PATCH/RFC 07/11] run-command: support input-fd Johannes Sixt
2009-11-27 14:39 ` Erik Faye-Lund
2009-11-27 20:14 ` Johannes Sixt
2009-12-08 13:46 ` Erik Faye-Lund
2009-11-26 21:46 ` [msysGit] [PATCH/RFC 06/11] run-command: add kill_async() and is_async_alive() Johannes Sixt
2009-11-27 16:04 ` Erik Faye-Lund
2009-11-27 19:59 ` Johannes Sixt
2009-12-02 15:57 ` Erik Faye-Lund
2009-12-02 19:27 ` Johannes Sixt
2010-01-09 0:49 ` Erik Faye-Lund
2010-01-10 17:06 ` Erik Faye-Lund
2009-11-26 21:23 ` [msysGit] [PATCH/RFC 03/11] mingw: implement syslog Johannes Sixt
2009-11-27 8:09 ` Erik Faye-Lund
2009-11-27 19:23 ` Johannes Sixt
2009-12-08 14:01 ` Erik Faye-Lund
2009-11-26 0:59 ` [PATCH/RFC 02/11] strbuf: add non-variadic function strbuf_vaddf() Junio C Hamano
2009-11-26 10:38 ` Erik Faye-Lund
2009-11-26 11:13 ` Paolo Bonzini
2009-11-26 18:46 ` Junio C Hamano
2009-11-26 23:37 ` Erik Faye-Lund
2009-11-27 7:09 ` Johannes Sixt
2009-11-26 8:24 ` [PATCH/RFC 01/11] mingw: add network-wrappers for daemon Martin Storsjö
2009-11-26 10:43 ` [PATCH] Improve the mingw getaddrinfo stub to handle more use cases Martin Storsjö
2009-11-26 10:46 ` [PATCH/RFC 01/11] mingw: add network-wrappers for daemon Erik Faye-Lund
2009-11-26 11:03 ` Martin Storsjö
2009-12-02 13:01 ` Erik Faye-Lund
2009-12-02 13:21 ` Martin Storsjö
2009-12-02 13:49 ` Erik Faye-Lund
2009-12-02 15:11 ` Erik Faye-Lund
2009-12-02 19:34 ` Johannes Sixt
2009-11-26 20:04 ` [msysGit] [PATCH/RFC 00/11] daemon-win32 Johannes Sixt
-- strict thread matches above, loose matches on Subject: below --
2009-11-26 0:39 Erik Faye-Lund
2009-11-26 0:39 ` [PATCH/RFC 01/11] mingw: add network-wrappers for daemon Erik Faye-Lund
2009-11-26 0:39 ` [PATCH/RFC 02/11] strbuf: add non-variadic function strbuf_vaddf() Erik Faye-Lund
2009-11-26 0:39 ` [PATCH/RFC 03/11] mingw: implement syslog Erik Faye-Lund
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=1259196260-3064-4-git-send-email-kusmabite@gmail.com \
--to=kusmabite@googlemail.com \
--cc=dotzenlabs@gmail.com \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.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).