Commit 7ea23e0f authored by ibuler's avatar ibuler

修复无法终结web进程的bug

parent e60a3a69
...@@ -29,7 +29,7 @@ import struct, fcntl, signal, socket, select, fnmatch ...@@ -29,7 +29,7 @@ import struct, fcntl, signal, socket, select, fnmatch
import paramiko import paramiko
from connect import Tty from connect import Tty
from connect import TtyLog from connect import TtyLog, Log
try: try:
import simplejson as json import simplejson as json
...@@ -186,11 +186,11 @@ class WebTty(Tty): ...@@ -186,11 +186,11 @@ class WebTty(Tty):
class WebTerminalKillHandler(tornado.web.RequestHandler): class WebTerminalKillHandler(tornado.web.RequestHandler):
def get(self): def get(self):
ws_id = self.get_argument('id') ws_id = self.get_argument('id')
Log.objects.filter(id=ws_id).update(is_finished=True)
for ws in WebTerminalHandler.clients: for ws in WebTerminalHandler.clients:
print ws.id print ws.id
if ws.id == int(ws_id): if ws.id == int(ws_id):
print "killed" print "killed"
ws.log.is_finished = True
ws.log.save() ws.log.save()
ws.close() ws.close()
print len(WebTerminalHandler.clients) print len(WebTerminalHandler.clients)
......
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