vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge pr from mengskysama

Browse source
This commit is contained in:
BreakWa11 2015-10-26 14:48:54 +08:00
parent 59105f6e64
commit 6ee8035735
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shadowsocks/lru_cache.py
View file

@ -88,12 +88,12 @@ class LRUCache(collections.MutableMapping):
self.close_callback(value) self.close_callback(value)
self._closed_values.add(value) self._closed_values.add(value)
for key in self._time_to_keys[least]: for key in self._time_to_keys[least]:
self._last_visits.popleft()
if key in self._store: if key in self._store:
if now - self._keys_to_last_time[key] > self.timeout: if now - self._keys_to_last_time[key] > self.timeout:
del self._store[key] del self._store[key]
del self._keys_to_last_time[key] del self._keys_to_last_time[key]
c += 1 c += 1
self._last_visits.popleft()
del self._time_to_keys[least] del self._time_to_keys[least]
if c: if c:
self._closed_values.clear() self._closed_values.clear()

1
shadowsocks/udprelay.py
View file

@ -1293,6 +1293,7 @@ class UDPRelay(object):
logging.info('closed UDP port %d', self._listen_port) logging.info('closed UDP port %d', self._listen_port)
before_sweep_size = len(self._sockets) before_sweep_size = len(self._sockets)
self._cache.sweep() self._cache.sweep()
self._dns_cache.sweep()
if before_sweep_size != len(self._sockets): if before_sweep_size != len(self._sockets):
logging.debug('UDP port %5d sockets %d' % (self._listen_port, len(self._sockets))) logging.debug('UDP port %5d sockets %d' % (self._listen_port, len(self._sockets)))
self._client_fd_to_server_addr.sweep() self._client_fd_to_server_addr.sweep()