mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

u2c: adaptive connection:keepalive expiration

Browse source
This commit is contained in:
ed 2024-11-10 17:43:40 +00:00
parent 2bf9055cae
commit c784e5285e
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bin/u2c.py
View file

@ -1,8 +1,8 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from __future__ import print_function, unicode_literals from __future__ import print_function, unicode_literals
S_VERSION = "2.5" S_VERSION = "2.6"
S_BUILD_DT = "2024-10-18" S_BUILD_DT = "2024-11-10"
""" """
u2c.py: upload to copyparty u2c.py: upload to copyparty
@ -189,6 +189,8 @@ class HCli(object):
return C(self.addr, self.port, timeout=timeout, **args) return C(self.addr, self.port, timeout=timeout, **args)
def req(self, meth, vpath, hdrs, body=None, ctype=None): def req(self, meth, vpath, hdrs, body=None, ctype=None):
now = time.time()
hdrs.update(self.base_hdrs) hdrs.update(self.base_hdrs)
if self.ar.a: if self.ar.a:
hdrs["PW"] = self.ar.a hdrs["PW"] = self.ar.a
@ -201,7 +203,9 @@ class HCli(object):
# large timeout for handshakes (safededup) # large timeout for handshakes (safededup)
conns = self.hconns if ctype == MJ else self.conns conns = self.hconns if ctype == MJ else self.conns
c = conns.pop() if conns else self._connect(999 if ctype == MJ else 128) while conns and self.ar.cxp < now - conns[0][0]:
conns.pop(0)[1].close()
c = conns.pop()[1] if conns else self._connect(999 if ctype == MJ else 128)
try: try:
c.request(meth, vpath, body, hdrs) c.request(meth, vpath, body, hdrs)
if PY27: if PY27:
@ -210,8 +214,15 @@ class HCli(object):
rsp = c.getresponse() rsp = c.getresponse()
data = rsp.read() data = rsp.read()
conns.append(c) conns.append((time.time(), c))
return rsp.status, data.decode("utf-8") return rsp.status, data.decode("utf-8")
except http_client.BadStatusLine:
if self.ar.cxp > 4:
t = "\nWARNING: --cxp probably too high; reducing from %d to 4"
print(t % (self.ar.cxp,))
self.ar.cxp = 4
c.close()
raise
except: except:
c.close() c.close()
raise raise
@ -1503,6 +1514,7 @@ source file/folder selection uses rsync syntax, meaning that:
ap.add_argument("--szm", type=int, metavar="MiB", default=96, help="max size of each POST (default is cloudflare max)") ap.add_argument("--szm", type=int, metavar="MiB", default=96, help="max size of each POST (default is cloudflare max)")
ap.add_argument("-nh", action="store_true", help="disable hashing while uploading") ap.add_argument("-nh", action="store_true", help="disable hashing while uploading")
ap.add_argument("-ns", action="store_true", help="no status panel (for slow consoles and macos)") ap.add_argument("-ns", action="store_true", help="no status panel (for slow consoles and macos)")
ap.add_argument("--cxp", type=float, metavar="SEC", default=57, help="assume http connections expired after SEConds")
ap.add_argument("--cd", type=float, metavar="SEC", default=5, help="delay before reattempting a failed handshake/upload") ap.add_argument("--cd", type=float, metavar="SEC", default=5, help="delay before reattempting a failed handshake/upload")
ap.add_argument("--safe", action="store_true", help="use simple fallback approach") ap.add_argument("--safe", action="store_true", help="use simple fallback approach")
ap.add_argument("-z", action="store_true", help="ZOOMIN' (skip uploading files if they exist at the destination with the ~same last-modified timestamp, so same as yolo / turbo with date-chk but even faster)") ap.add_argument("-z", action="store_true", help="ZOOMIN' (skip uploading files if they exist at the destination with the ~same last-modified timestamp, so same as yolo / turbo with date-chk but even faster)")