Rewrite logging calls to use the new APIs.

4 files changed, 20 insertions, 20 deletions

diff --git a/src/socketengines/epoll.cpp b/src/socketengines/epoll.cpp
index 727ca15ba..0f7da7edf 100644
--- a/src/socketengines/epoll.cpp
+++ b/src/socketengines/epoll.cpp
@@ -90,13 +90,13 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	int fd = eh->GetFd();
 	if (fd < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
+		ServerInstance->Logs.Debug("SOCKET", "AddFd out of range: (fd: %d)", fd);
 		return false;
 	}
 
 	if (!SocketEngine::AddFdRef(eh))
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+		ServerInstance->Logs.Debug("SOCKET", "Attempt to add duplicate fd: %d", fd);
 		return false;
 	}
 
@@ -107,11 +107,11 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev);
 	if (i < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Error adding fd: %d to socketengine: %s", fd, strerror(errno));
+		ServerInstance->Logs.Debug("SOCKET", "Error adding fd: %d to socketengine: %s", fd, strerror(errno));
 		return false;
 	}
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "New file descriptor: %d", fd);
 
 	eh->SetEventMask(event_mask);
 	ResizeDouble(events);
@@ -139,7 +139,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 	int fd = eh->GetFd();
 	if (fd < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
+		ServerInstance->Logs.Debug("SOCKET", "DelFd out of range: (fd: %d)", fd);
 		return;
 	}
 
@@ -151,12 +151,12 @@ void SocketEngine::DelFd(EventHandler* eh)
 
 	if (i < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "epoll_ctl can't remove socket: %s", strerror(errno));
+		ServerInstance->Logs.Debug("SOCKET", "epoll_ctl can't remove socket: %s", strerror(errno));
 	}
 
 	SocketEngine::DelFdRef(eh);
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "Remove file descriptor: %d", fd);
 }
 
 int SocketEngine::DispatchEvents()
diff --git a/src/socketengines/kqueue.cpp b/src/socketengines/kqueue.cpp
index 6182fad5e..69b63f76b 100644
--- a/src/socketengines/kqueue.cpp
+++ b/src/socketengines/kqueue.cpp
@@ -108,7 +108,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	struct kevent* ke = GetChangeKE();
 	EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, udata_cast(eh));
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "New file descriptor: %d", fd);
 
 	eh->SetEventMask(event_mask);
 	OnSetEvent(eh, 0, event_mask);
@@ -123,7 +123,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 
 	if (fd < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEFAULT, "DelFd() on invalid fd: %d", fd);
+		ServerInstance->Logs.Normal("SOCKET", "DelFd() on invalid fd: %d", fd);
 		return;
 	}
 
@@ -138,7 +138,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 
 	SocketEngine::DelFdRef(eh);
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "Remove file descriptor: %d", fd);
 }
 
 void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
diff --git a/src/socketengines/poll.cpp b/src/socketengines/poll.cpp
index a86e772fa..7b00fcc6d 100644
--- a/src/socketengines/poll.cpp
+++ b/src/socketengines/poll.cpp
@@ -68,13 +68,13 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	int fd = eh->GetFd();
 	if (fd < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "AddFd out of range: (fd: %d)", fd);
+		ServerInstance->Logs.Debug("SOCKET", "AddFd out of range: (fd: %d)", fd);
 		return false;
 	}
 
 	if (static_cast<unsigned int>(fd) < fd_mappings.size() && fd_mappings[fd] != -1)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+		ServerInstance->Logs.Debug("SOCKET", "Attempt to add duplicate fd: %d", fd);
 		return false;
 	}
 
@@ -82,7 +82,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 
 	if (!SocketEngine::AddFdRef(eh))
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Attempt to add duplicate fd: %d", fd);
+		ServerInstance->Logs.Debug("SOCKET", "Attempt to add duplicate fd: %d", fd);
 		return false;
 	}
 
@@ -94,7 +94,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	events[index].fd = fd;
 	events[index].events = mask_to_poll(event_mask);
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d (%d; index %d)", fd, events[index].events, index);
+	ServerInstance->Logs.Debug("SOCKET", "New file descriptor: %d (%d; index %d)", fd, events[index].events, index);
 	eh->SetEventMask(event_mask);
 	return true;
 }
@@ -104,7 +104,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 	int fd = eh->GetFd();
 	if (fd < 0 || static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "SetEvents() on unknown fd: %d", eh->GetFd());
+		ServerInstance->Logs.Debug("SOCKET", "SetEvents() on unknown fd: %d", eh->GetFd());
 		return;
 	}
 
@@ -116,13 +116,13 @@ void SocketEngine::DelFd(EventHandler* eh)
 	int fd = eh->GetFd();
 	if (fd < 0)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd out of range: (fd: %d)", fd);
+		ServerInstance->Logs.Debug("SOCKET", "DelFd out of range: (fd: %d)", fd);
 		return;
 	}
 
 	if (static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
 	{
-		ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "DelFd() on unknown fd: %d", fd);
+		ServerInstance->Logs.Debug("SOCKET", "DelFd() on unknown fd: %d", fd);
 		return;
 	}
 
@@ -150,7 +150,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 
 	SocketEngine::DelFdRef(eh);
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d (index: %d) "
+	ServerInstance->Logs.Debug("SOCKET", "Remove file descriptor: %d (index: %d) "
 			"(Filled gap with: %d (index: %d))", fd, index, last_fd, last_index);
 }
 
diff --git a/src/socketengines/select.cpp b/src/socketengines/select.cpp
index cbf15f3dc..5f5c4173b 100644
--- a/src/socketengines/select.cpp
+++ b/src/socketengines/select.cpp
@@ -80,7 +80,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 	if (fd > MaxFD)
 		MaxFD = fd;
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "New file descriptor: %d", fd);
 	return true;
 }
 
@@ -102,7 +102,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 	if (fd == MaxFD)
 		--MaxFD;
 
-	ServerInstance->Logs.Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
+	ServerInstance->Logs.Debug("SOCKET", "Remove file descriptor: %d", fd);
 }
 
 void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)