From: Guus Sliepen Date: Fri, 27 Dec 2013 11:14:58 +0000 (+0100) Subject: Remove or lower the priority of some debug messages. X-Git-Tag: 1.0.23-android-1~4 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=a0c544df5d882bea812fb0ef648cdee98939e89c;p=tinc Remove or lower the priority of some debug messages. --- diff --git a/src/conf.c b/src/conf.c index e2b64429..09f2d138 100644 --- a/src/conf.c +++ b/src/conf.c @@ -393,7 +393,6 @@ bool read_server_config(void) { if (l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) { free(fname); xasprintf(&fname, "%s/%s", dname, ep->d_name); - logger(LOG_DEBUG, "Reading conf file \"%s\"", fname); x = read_config_file(config_tree, fname); } } diff --git a/src/meta.c b/src/meta.c index 40770298..0b8a379b 100644 --- a/src/meta.c +++ b/src/meta.c @@ -180,7 +180,7 @@ bool receive_meta(connection_t *c) { if(!c->node) { if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) { if(c->buffer[0] == 0 && c->buffer[1] == 0x5a) { - logger(LOG_DEBUG, "Proxy request granted"); + ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted"); } else { logger(LOG_ERR, "Proxy request rejected"); return false; @@ -199,9 +199,9 @@ bool receive_meta(connection_t *c) { return false; } if(c->buffer[3] == 0) { - logger(LOG_DEBUG, "Proxy request granted"); + ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted"); } else { - logger(LOG_DEBUG, "Proxy request rejected"); + logger(LOG_ERR, "Proxy request rejected"); return false; } } else { diff --git a/src/net_socket.c b/src/net_socket.c index 48e07834..b889bca6 100644 --- a/src/net_socket.c +++ b/src/net_socket.c @@ -311,7 +311,7 @@ static void do_outgoing_pipe(connection_t *c, char *command) { if(fork()) { c->socket = fd[0]; close(fd[1]); - logger(LOG_DEBUG, "Using proxy %s", command); + ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Using proxy %s", command); return; }