mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
connect back: a replaced -r service stops waiting at the reload
A -r service waited up to 60 s for the go-ahead on the connection it made, without looking at a reload. One replaced by a reload went on waiting, holding a slot and a thread, and took a client if the far side's go-ahead came in that time; every reload left another such connection in the far side's queue. The wait is now a second at a time (60 s in all, as before): at a reload the service takes a go-ahead already there, its client going on in the service which replaced it, and otherwise closes the connection and stops. The far side (-R) sent its go-ahead to any connection it accepted, and a closed one cost it a client. A connection the -r side closed, at a reload or after its wait, is readable before any go-ahead, since that side sends nothing first: once past the ACL it is passed over, without counting as one of the tries for as many as the listen queue holds (1 + maxchild/16), so that connections made to be closed or to send something cannot keep a client's thread in the loop. Tests: reattach's far side passes over closed connections as -R does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
63a736c693
commit
8cc7d255af
3 files changed
+44
-3
No files matched your search
@@ -3,6 +3,7 @@ the rules of the newest service on its listener, taking one of its maxconn
|
||||
slots, and is dropped where that cannot be."""
|
||||
|
||||
import base64
|
||||
import select
|
||||
import socket
|
||||
import threading
|
||||
import time
|
||||
@@ -128,7 +129,13 @@ def run(t):
|
||||
"""A request over a connection the -r service made: the peer is its
|
||||
client once it has sent C."""
|
||||
try:
|
||||
c, _ = peer.accept()
|
||||
# as the far side of a connect-back service does: a connection
|
||||
# closed by a service which stopped waiting is passed over
|
||||
while True:
|
||||
c, _ = peer.accept()
|
||||
if not select.select([c], [], [], 0)[0]:
|
||||
break
|
||||
c.close()
|
||||
c.settimeout(30)
|
||||
c.sendall(b"C")
|
||||
auth = base64.b64encode(b"alice:one").decode()
|
||||
|
||||
Reference in new issue
Block a user