Fixed log messages

Pulled by hand

5f712ba731daa8bc7ba56ede2f12a9d4c83a90c4
71ec7a3bd21ff91bb8b4fa99e32d4ba035d54b9e

diff --git a/src/main/event.c b/src/main/event.c
index 92af64acf442c2f8dbaef6e9eb40c2bbf1b1845f..5f48274d7723c45e272d617a67e9513bbb235bbc 100644 (file)
--- a/src/main/event.c
+++ b/src/main/event.c
@@ -290,7 +290,7 @@ static int proxy_id_alloc(REQUEST *request, RADIUS_PACKET *packet)
         */
        proxy_listener = proxy_new_listener(&packet->src_ipaddr, FALSE);
        if (!proxy_listener) {
-               RDEBUG2("ERROR: Failed to create a new socket for proxying requests.");
+               radlog(L_PROXY, "Failed to create a new socket for proxying requests.");
                return 0;
        }
        
@@ -628,7 +628,7 @@ static void no_response_to_ping(void *ctx)
        home = request->home_server;
        home->num_received_pings = 0;
 
-       RDEBUG2("No response to status check %d from home server %s port %d",
+       radlog(L_ERR, "No response to status check %d for home server %s port %d",
               request->number,
               inet_ntop(request->proxy->dst_ipaddr.af,
                         &request->proxy->dst_ipaddr.ipaddr,
@@ -651,7 +651,7 @@ static void received_response_to_ping(REQUEST *request)
        home = request->home_server;
        home->num_received_pings++;
 
-       RDEBUG2("Received response to status check %d (%d in current sequence)",
+       radlog(L_PROXY, "Received response to status check %d (%d in current sequence)",
               request->number, home->num_received_pings);
 
        /*
@@ -685,7 +685,7 @@ static void received_response_to_ping(REQUEST *request)
                RDEBUG2("Hmm... no event for home server.  Oh well.");
        }
 
-       radlog(L_INFO, "PROXY: Marking home server %s port %d alive",
+       radlog(L_PROXY, "Marking home server %s port %d alive",
               inet_ntop(request->proxy->dst_ipaddr.af,
                         &request->proxy->dst_ipaddr.ipaddr,
                         buffer, sizeof(buffer)),
@@ -3156,7 +3156,7 @@ void event_new_fd(rad_listen_t *this)
                if (just_started) {
                        DEBUG("Listening on %s", buffer);
                } else {
-                       DEBUG2(" ... adding new socket %s", buffer);
+                       radlog(L_INFO, " ... adding new socket %s", buffer);
                }
                if (!fr_event_fd_insert(el, 0, this->fd,
                                        event_socket_handler, this)) {
@@ -3169,7 +3169,7 @@ void event_new_fd(rad_listen_t *this)
        }
        
        if (this->status == RAD_LISTEN_STATUS_CLOSED) {
-               DEBUG2(" ... closing socket %s", buffer);
+               radlog(L_INFO, " ... closing socket %s", buffer);
                
                fr_event_fd_delete(el, 0, this->fd);
                this->status = RAD_LISTEN_STATUS_FINISH;
@@ -3204,7 +3204,7 @@ static void handle_signal_self(int flag)
                time_t when;
                static time_t last_hup = 0;
 
-               DEBUG("Received HUP signal.");
+               radlog(L_INFO, "Received HUP signal.");
 
                when = time(NULL);
                if ((int) (when - last_hup) < 5) {
@@ -3395,7 +3395,7 @@ static void event_status(struct timeval *wake)
        }
 
        if (!wake) {
-               DEBUG("Ready to process requests.");
+               radlog(L_INFO, "Ready to process requests.");
 
        } else if ((wake->tv_sec != 0) ||
                   (wake->tv_usec >= 100000)) {