oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Log: new logging library API

Browse Source 
Prepare to migrate away from GLib.  Currently, we're still using GLib
as a backend.
This commit is contained in:
Max Kellermann
2013-09-27 22:31:24 +02:00
parent c53492a76a
commit 060814daa8
162 changed files with 1992 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/event/ServerSocket.cxx
View File

@@ -31,6 +31,7 @@
#include "system/fd_util.h"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include <glib.h>
@@ -52,9 +53,6 @@
#include <netdb.h>
#endif
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "listen"
#define DEFAULT_PORT 6600
class OneServerSocket final : private SocketMonitor {
@@ -167,14 +165,16 @@ OneServerSocket::Accept()
&peer_address_length);
if (peer_fd < 0) {
const SocketErrorMessage msg;
g_warning("accept() failed: %s", (const char *)msg);
FormatError(server_socket_domain,
"accept() failed: %s", (const char *)msg);
return;
}
if (socket_keepalive(peer_fd)) {
const SocketErrorMessage msg;
g_warning("Could not set TCP keepalive option: %s",
(const char *)msg);
FormatError(server_socket_domain,
"Could not set TCP keepalive option: %s",
(const char *)msg);
}
parent.OnAccept(peer_fd,
@@ -241,11 +241,12 @@ ServerSocket::Open(Error &error)
if (good != nullptr && good->GetSerial() == i.GetSerial()) {
char *address_string = i.ToString();
char *good_string = good->ToString();
g_warning("bind to '%s' failed: %s "
"(continuing anyway, because "
"binding to '%s' succeeded)",
address_string, error2.GetMessage(),
good_string);
FormatWarning(server_socket_domain,
"bind to '%s' failed: %s "
"(continuing anyway, because "
"binding to '%s' succeeded)",
address_string, error2.GetMessage(),
good_string);
g_free(address_string);
g_free(good_string);
} else if (bad == nullptr) {