remove pdb support, remove unused imports
+ remove tcp_lineserver
This commit is contained in:
31
webserver.py
31
webserver.py
@ -2,23 +2,15 @@ from gevent import monkey
|
||||
monkey.patch_all()
|
||||
import sys
|
||||
import time
|
||||
import os
|
||||
import signal
|
||||
import socket
|
||||
import traceback
|
||||
import logging
|
||||
import json
|
||||
from collections import deque
|
||||
from datetime import date, datetime
|
||||
import tcp_lineserver
|
||||
import gevent
|
||||
import gevent.pywsgi
|
||||
import gevent.queue
|
||||
from gevent.lock import RLock
|
||||
import flask
|
||||
import pprint
|
||||
import random
|
||||
import uuid
|
||||
import circularlog
|
||||
|
||||
|
||||
@ -91,7 +83,7 @@ def get_update(path=None):
|
||||
lastmsg = time.time()
|
||||
else:
|
||||
gevent.sleep(pollinterval)
|
||||
except (GeneratorExit, tcp_lineserver.Disconnected) as e:
|
||||
except GeneratorExit as e:
|
||||
logging.info("except clause %r", repr(e))
|
||||
logging.info('CLOSED %s', client.id)
|
||||
print('CLOSE client')
|
||||
@ -132,6 +124,7 @@ def export():
|
||||
logging.info('GET %s %s', path, repr(kwargs))
|
||||
try:
|
||||
id = kwargs.pop('id')
|
||||
print('export')
|
||||
client = instrument.clients[id]
|
||||
bytes = client.w_export(**kwargs)
|
||||
return flask.send_file(
|
||||
@ -234,15 +227,10 @@ def hostport_split(hostport):
|
||||
return (h[0], int(h[1]))
|
||||
|
||||
|
||||
def handle_pdb(sig, frame):
|
||||
import pdb
|
||||
print('PDB')
|
||||
pdb.Pdb().set_trace(frame)
|
||||
|
||||
|
||||
def handle_term(sig, _):
|
||||
server.stop()
|
||||
server.close()
|
||||
# def handle_pdb(sig, frame):
|
||||
# import pdb
|
||||
# print('PDB')
|
||||
# pdb.Pdb().set_trace(frame)
|
||||
|
||||
|
||||
def main(cls, **config):
|
||||
@ -255,7 +243,12 @@ def main(cls, **config):
|
||||
inst_name = config['instrument']
|
||||
instrument = cls(inst_name, config)
|
||||
|
||||
signal.signal(signal.SIGUSR1, handle_pdb)
|
||||
# signal.signal(signal.SIGUSR1, handle_pdb)
|
||||
|
||||
def handle_term(sig, _):
|
||||
server.stop()
|
||||
server.close()
|
||||
|
||||
signal.signal(signal.SIGTERM, handle_term)
|
||||
|
||||
app.debug = True
|
||||
|
Reference in New Issue
Block a user