Commit f7e1cbcd authored by ibuler's avatar ibuler

[Bugfix] 修复监控session和监控窗口变化引起的bug

parent e2b2d495
...@@ -150,10 +150,10 @@ class Coco: ...@@ -150,10 +150,10 @@ class Coco:
for s in self.sessions: for s in self.sessions:
if not s.stop_evt.is_set(): if not s.stop_evt.is_set():
continue continue
if s.date_finished is None: if s.date_end is None:
self.remove_session(s) self.remove_session(s)
continue continue
delta = datetime.datetime.now() - s.date_finished delta = datetime.datetime.now() - s.date_end
if delta > datetime.timedelta(seconds=interval*5): if delta > datetime.timedelta(seconds=interval*5):
self.remove_session(s) self.remove_session(s)
time.sleep(interval) time.sleep(interval)
......
...@@ -7,8 +7,8 @@ import threading ...@@ -7,8 +7,8 @@ import threading
import logging import logging
import time import time
import weakref import weakref
import paramiko import paramiko
from paramiko.ssh_exception import SSHException
from .session import Session from .session import Session
from .models import Server from .models import Server
...@@ -130,7 +130,10 @@ class ProxyServer: ...@@ -130,7 +130,10 @@ class ProxyServer:
width = self.request.meta.get('width', 80) width = self.request.meta.get('width', 80)
height = self.request.meta.get('height', 24) height = self.request.meta.get('height', 24)
logger.debug("Change win size: %s - %s" % (width, height)) logger.debug("Change win size: %s - %s" % (width, height))
try:
self.server.chan.resize_pty(width=width, height=height) self.server.chan.resize_pty(width=width, height=height)
except SSHException:
break
def watch_win_size_change_async(self): def watch_win_size_change_async(self):
thread = threading.Thread(target=self.watch_win_size_change) thread = threading.Thread(target=self.watch_win_size_change)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment