jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added two options for user configuration

pull/144/head
Sheng 2020-02-23 11:11:41 +08:00
parent 32d7236630
commit 795875807b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webssh/handler.py
View File

@ -443,7 +443,7 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
logging.info('Connecting to {}:{}'.format(*dst_addr)) logging.info('Connecting to {}:{}'.format(*dst_addr))
try: try:
ssh.connect(*args, timeout=6) ssh.connect(*args, timeout=options.timeout)
except socket.error: except socket.error:
raise ValueError('Unable to connect to {}:{}'.format(*dst_addr)) raise ValueError('Unable to connect to {}:{}'.format(*dst_addr))
except paramiko.BadAuthenticationType: except paramiko.BadAuthenticationType:
@ -511,7 +511,8 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
clients[ip] = workers clients[ip] = workers
worker.src_addr = (ip, port) worker.src_addr = (ip, port)
workers[worker.id] = worker workers[worker.id] = worker
self.loop.call_later(DELAY, recycle_worker, worker) self.loop.call_later(options.delay or DELAY, recycle_worker,
worker)
self.result.update(id=worker.id, encoding=worker.encoding) self.result.update(id=worker.id, encoding=worker.encoding)
self.write(self.result) self.write(self.result)

2
webssh/settings.py
View File

@ -43,6 +43,8 @@ define('origin', default='same', help='''Origin policy,
separated by comma; separated by comma;
'*': wildcard policy, matches any domain, allowed in debug mode only.''') '*': wildcard policy, matches any domain, allowed in debug mode only.''')
define('wpintvl', type=int, default=0, help='Websocket ping interval') define('wpintvl', type=int, default=0, help='Websocket ping interval')
define('timeout', type=int, default=3, help='SSH connection timeout')
define('delay', type=int, default=0, help='The delay to call recycle_worker')
define('maxconn', type=int, default=20, define('maxconn', type=int, default=20,
help='Maximum live connections (ssh sessions) per client') help='Maximum live connections (ssh sessions) per client')
define('font', default='', help='custom font filename') define('font', default='', help='custom font filename')