Regularize error message for proxy_new_listener

diff --git a/src/main/listen.c b/src/main/listen.c
index cf43636..01661c1 100644 (file)
--- a/src/main/listen.c
+++ b/src/main/listen.c
@@ -2603,7 +2603,7 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
        if ((home->limit.max_connections > 0) &&
            (home->limit.num_connections >= home->limit.max_connections)) {
                WDEBUG("Home server has too many open connections (%d)",
-                     home->limit.max_connections);
+                      home->limit.max_connections);
                return NULL;
        }
 
@@ -2624,9 +2624,13 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
        sock->my_port = src_port;
        sock->proto = home->proto;
 
+       /*
+        *      For error messages.
+        */
+       this->print(this, buffer, sizeof(buffer));
+
        if (debug_flag >= 2) {
-               this->print(this, buffer, sizeof(buffer));
-               DEBUG("Opening new %s", buffer);
+               DEBUG("Opening new proxy socket '%s'", buffer);
        }
 
 #ifdef WITH_TCP
@@ -2650,7 +2654,7 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
 
        if (this->fd < 0) {
                this->print(this, buffer,sizeof(buffer));
-               ERROR("Failed opening client socket %s : %s",
+               ERROR("Failed opening proxy socket '%s' : %s",
                      buffer, fr_strerror());
                home->last_failed_open = now;
                listen_free(&this);
@@ -2664,7 +2668,7 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
                DEBUG("Trying SSL to port %d\n", home->port);
                sock->ssn = tls_new_client_session(home->tls, this->fd);
                if (!sock->ssn) {
-                       ERROR("Failed starting SSL to %s", buffer);
+                       ERROR("Failed starting SSL to '%s'", buffer);
                        home->last_failed_open = now;
                        listen_free(&this);
                        return NULL;
@@ -2685,8 +2689,8 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
                memset(&src, 0, sizeof_src);
                if (getsockname(this->fd, (struct sockaddr *) &src,
                                &sizeof_src) < 0) {
-                       ERROR("Failed getting socket name: %s",
-                              fr_syserror(errno));
+                       ERROR("Failed getting socket name for '%s': %s",
+                             buffer, fr_syserror(errno));
                        home->last_failed_open = now;
                        listen_free(&this);
                        return NULL;
@@ -2694,7 +2698,7 @@ rad_listen_t *proxy_new_listener(home_server_t *home, int src_port)
 
                if (!fr_sockaddr2ipaddr(&src, sizeof_src,
                                        &sock->my_ipaddr, &sock->my_port)) {
-                       ERROR("Socket has unsupported address family");
+                       ERROR("Socket has unsupported address family for '%s'", buffer);
                        home->last_failed_open = now;
                        listen_free(&this);
                        return NULL;

diff --git a/src/main/process.c b/src/main/process.c
index 092a758..fd46f16 100644 (file)
--- a/src/main/process.c
+++ b/src/main/process.c
@@ -1843,7 +1843,6 @@ static int insert_into_proxy_hash(REQUEST *request)
                this = proxy_new_listener(request->home_server, 0);
                if (!this) {
                        PTHREAD_MUTEX_UNLOCK(&proxy_mutex);
-                       ERROR("proxy: Failed to create a new outbound socket");
                        goto fail;
                }