linkkf 로직수정중
This commit is contained in:
@@ -4,17 +4,18 @@ import time
|
||||
import traceback
|
||||
|
||||
from flask import request
|
||||
from support import SingletonClass
|
||||
|
||||
from framework import F
|
||||
from support import SingletonClass
|
||||
|
||||
namespace = 'log'
|
||||
|
||||
@F.socketio.on('connect', namespace='/%s' % namespace)
|
||||
@F.login_required
|
||||
def socket_connect():
|
||||
F.logger.debug('log connect')
|
||||
|
||||
@F.socketio.on('start', namespace='/%s' % namespace)
|
||||
@F.login_required
|
||||
def socket_file(data):
|
||||
try:
|
||||
package = filename = None
|
||||
@@ -24,8 +25,8 @@ def socket_file(data):
|
||||
filename = data['filename']
|
||||
LogViewer.instance().start(package, filename, request.sid)
|
||||
F.logger.debug('start package:%s filename:%s sid:%s', package, filename, request.sid)
|
||||
except Exception as exception:
|
||||
F.logger.error('Exception:%s', exception)
|
||||
except Exception as e:
|
||||
F.logger.error(f"Exception:{str(e)}")
|
||||
F.logger.error(traceback.format_exc())
|
||||
|
||||
@F.socketio.on('disconnect', namespace='/%s' % namespace)
|
||||
@@ -33,8 +34,8 @@ def disconnect():
|
||||
try:
|
||||
LogViewer.instance().disconnect(request.sid)
|
||||
F.logger.debug('disconnect sid:%s', request.sid)
|
||||
except Exception as exception:
|
||||
F.logger.error('Exception:%s', exception)
|
||||
except Exception as e:
|
||||
F.logger.error(f"Exception:{str(e)}")
|
||||
F.logger.error(traceback.format_exc())
|
||||
|
||||
|
||||
@@ -62,18 +63,17 @@ class WatchThread(threading.Thread):
|
||||
key = 'filename'
|
||||
value = self.filename
|
||||
if os.path.exists(logfile):
|
||||
with open(logfile, 'r') as f:
|
||||
with open(logfile, 'r', encoding='utf8') as f:
|
||||
f.seek(0, os.SEEK_END)
|
||||
while not self.stop_flag:
|
||||
line = f.readline()
|
||||
if not line:
|
||||
time.sleep(0.1) # Sleep briefly
|
||||
continue
|
||||
F.socketio.emit("add", {key : value, 'data': line}, namespace='/log', broadcast=True)
|
||||
F.socketio.emit("add", {key : value, 'data': line}, namespace='/log')
|
||||
F.logger.debug('WatchThread.. End %s', value)
|
||||
else:
|
||||
F.socketio.emit("add", {key : value, 'data': 'not exist logfile'}, namespace='/log', broadcast=True)
|
||||
|
||||
F.socketio.emit("add", {key : value, 'data': 'not exist logfile'}, namespace='/log')
|
||||
|
||||
|
||||
class LogViewer(SingletonClass):
|
||||
|
||||
Reference in New Issue
Block a user