projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
495e4cf
)
Unify two debug messages.
author
Fabian Keil
<fk@fabiankeil.de>
Sat, 8 Nov 2008 15:29:58 +0000
(15:29 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sat, 8 Nov 2008 15:29:58 +0000
(15:29 +0000)
gateway.c
patch
|
blob
|
history
diff --git
a/gateway.c
b/gateway.c
index
76dc32b
..
b1a162b
100644
(file)
--- a/
gateway.c
+++ b/
gateway.c
@@
-1,4
+1,4
@@
-const char gateway_rcs[] = "$Id: gateway.c,v 1.
39 2008/10/25 11:33:01
fabiankeil Exp $";
+const char gateway_rcs[] = "$Id: gateway.c,v 1.
40 2008/11/08 15:14:05
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/gateway.c,v $
@@
-34,6
+34,9
@@
const char gateway_rcs[] = "$Id: gateway.c,v 1.39 2008/10/25 11:33:01 fabiankeil
*
* Revisions :
* $Log: gateway.c,v $
*
* Revisions :
* $Log: gateway.c,v $
+ * Revision 1.40 2008/11/08 15:14:05 fabiankeil
+ * Fix duplicated debugging check.
+ *
* Revision 1.39 2008/10/25 11:33:01 fabiankeil
* Remove already out-commented line left over from debugging.
*
* Revision 1.39 2008/10/25 11:33:01 fabiankeil
* Remove already out-commented line left over from debugging.
*
@@
-652,9
+655,10
@@
static void close_unusable_connections(void)
if (CONNECTION_KEEP_ALIVE_TIMEOUT < time_open)
{
log_error(LOG_LEVEL_CONNECT,
if (CONNECTION_KEEP_ALIVE_TIMEOUT < time_open)
{
log_error(LOG_LEVEL_CONNECT,
- "The connection to %s:%d in slot %d timed out. Closing.",
- reusable_connection[slot].host, reusable_connection[slot].port,
- slot);
+ "The connection to %s:%d in slot %d timed out. "
+ "Closing socket %d.", reusable_connection[slot].host,
+ reusable_connection[slot].port, slot,
+ reusable_connection[slot].sfd);
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
continue;
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
continue;
@@
-663,9
+667,10
@@
static void close_unusable_connections(void)
if (!socket_is_still_usable(reusable_connection[slot].sfd))
{
log_error(LOG_LEVEL_CONNECT,
if (!socket_is_still_usable(reusable_connection[slot].sfd))
{
log_error(LOG_LEVEL_CONNECT,
- "Socket %d for %s:%d in slot %d is no longer usable. Closing.",
- reusable_connection[slot].sfd, reusable_connection[slot].host,
- reusable_connection[slot].port, slot);
+ "The connection to %s:%d in slot %d is no longer usable. "
+ "Closing socket %d.", reusable_connection[slot].host,
+ reusable_connection[slot].port, slot,
+ reusable_connection[slot].sfd);
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
continue;
close_socket(reusable_connection[slot].sfd);
mark_connection_closed(&reusable_connection[slot]);
continue;