1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From: YOKOTA Hiroshi <yokota.hgml@gmail.com>
Date: Sun, 23 Oct 2022 14:42:41 +0900
Subject: Add [] for IPv6 address in log file
---
src/calibre/srv/loop.py | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/calibre/srv/loop.py b/src/calibre/srv/loop.py
index c284b8b..36f2d4c 100644
--- a/src/calibre/srv/loop.py
+++ b/src/calibre/srv/loop.py
@@ -505,16 +505,28 @@ class ServerLoop:
self.setup_socket()
def serve(self):
+ def is_ipv6_addr(addr):
+ import socket
+ try:
+ socket.inet_pton(socket.AF_INET6, addr)
+ return True
+ except OSError:
+ return False
+
self.connection_map = {}
self.socket.listen(min(socket.SOMAXCONN, 128))
self.bound_address = ba = self.socket.getsockname()
if isinstance(ba, tuple):
- ba = ':'.join(map(str, ba))
+ if is_ipv6_addr(ba[0]):
+ addr = f'[{ba[0]}]'
+ else:
+ addr = f'{ba[0]}'
+ ba_str = f'{addr}:' + ':'.join(map(str, ba[1:]))
self.pool.start()
with TemporaryDirectory(prefix='srv-') as tdir:
self.tdir = tdir
if self.LISTENING_MSG:
- self.log(self.LISTENING_MSG, ba)
+ self.log(self.LISTENING_MSG, ba_str)
self.plugin_pool.start()
self.ready = True
|
