Skip to content

Commit 46588c3

Browse files
committed
PLINT-711 Enhancement for logging plugin responses
1 parent 947c578 commit 46588c3

1 file changed

Lines changed: 6 additions & 10 deletions

File tree

src/galaxy/api/jsonrpc.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,11 @@ def _parse_message(data):
299299
except TypeError:
300300
raise InvalidRequest()
301301

302-
def _send(self, data, sensitive=True):
302+
def _send(self, data, log_level=logging.DEBUG):
303303
try:
304304
line = self._encoder.encode(data)
305+
logger.log(log_level, "Sending data: %s", line)
305306
data = (line + "\n").encode("utf-8")
306-
if sensitive:
307-
logger.debug("Sending %d bytes of data", len(data))
308-
else:
309-
logger.debug("Sending data: %s", line)
310307
self._writer.write(data)
311308
except TypeError as error:
312309
logger.error(str(error))
@@ -317,16 +314,15 @@ def _send_response(self, request_id, result):
317314
"id": request_id,
318315
"result": result
319316
}
320-
self._send(response, sensitive=False)
317+
self._send(response, logging.INFO)
321318

322319
def _send_error(self, request_id, error):
323320
response = {
324321
"jsonrpc": "2.0",
325322
"id": request_id,
326323
"error": error.json()
327324
}
328-
329-
self._send(response, sensitive=False)
325+
self._send(response, logging.ERROR)
330326

331327
def _send_request(self, request_id, method, params):
332328
request = {
@@ -335,15 +331,15 @@ def _send_request(self, request_id, method, params):
335331
"id": request_id,
336332
"params": params
337333
}
338-
self._send(request, sensitive=True)
334+
self._send(request, logging.NOTSET)
339335

340336
def _send_notification(self, method, params):
341337
notification = {
342338
"jsonrpc": "2.0",
343339
"method": method,
344340
"params": params
345341
}
346-
self._send(notification, sensitive=True)
342+
self._send(notification, logging.NOTSET)
347343

348344
@staticmethod
349345
def _log_request(request, sensitive_params):

0 commit comments

Comments
 (0)