MISP/SkillAegis
MISP/SkillAegis
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: [backend] Fixed correct usage of logging API

Browse source
This commit is contained in:
Sami Mokaddem 2024-07-02 13:56:10 +02:00
parent 1f5bcb2e66
commit b8b6e8c44a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
misp_api.py
View file

@ -29,7 +29,7 @@ def get(url, data={}, api_key=misp_apikey):
try: try:
response = requestSession.get(full_url, data=data, headers=headers, verify=not misp_skipssl) response = requestSession.get(full_url, data=data, headers=headers, verify=not misp_skipssl)
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
logger.info('Could not perform request on MISP.', e) logger.info('Could not perform request on MISP. %s', e)
return None return None
return response.json() if response.headers['content-type'].startswith('application/json') else response.text return response.json() if response.headers['content-type'].startswith('application/json') else response.text
@ -45,7 +45,7 @@ def post(url, data={}, api_key=misp_apikey):
try: try:
response = requestSession.post(full_url, data=json.dumps(data), headers=headers, verify=not misp_skipssl) response = requestSession.post(full_url, data=json.dumps(data), headers=headers, verify=not misp_skipssl)
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
logger.info('Could not perform request on MISP.', e) logger.info('Could not perform request on MISP. %s', e)
return None return None
return response.json() if response.headers['content-type'].startswith('application/json') else response.text return response.json() if response.headers['content-type'].startswith('application/json') else response.text

8
server.py
View file

@ -58,11 +58,11 @@ app = socketio.WSGIApp(sio, static_files={
@sio.event @sio.event
def connect(sid, environ): def connect(sid, environ):
logger.debug("Client connected: " + sid) logger.debug("Client connected: %s", sid)
@sio.event @sio.event
def disconnect(sid): def disconnect(sid):
logger.debug("Client disconnected: " + sid) logger.debug("Client disconnected: %s", sid)
@sio.event @sio.event
def get_exercises(sid): def get_exercises(sid):
@ -110,7 +110,7 @@ def toggle_verbose_mode(sid, payload):
@sio.on('*') @sio.on('*')
def any_event(event, sid, data={}): def any_event(event, sid, data={}):
logger.info('>> Unhandled event', event) logger.info('>> Unhandled event %s', event)
def handleMessage(topic, s, message): def handleMessage(topic, s, message):
data = json.loads(message) data = json.loads(message)
@ -185,7 +185,7 @@ def forward_zmq_to_socketio():
ZMQ_MESSAGE_COUNT += 1 ZMQ_MESSAGE_COUNT += 1
handleMessage(topic, s, m) handleMessage(topic, s, m)
except Exception as e: except Exception as e:
logger.error('Error handling message', e) logger.error('Error handling message %s', e)
if __name__ == "__main__": if __name__ == "__main__":