IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Enhance logging by tracking stdout and stderr of subprocess when log level set to DEBUG.

Browse Source 
If the process terminates abnormally then the error is not logged which makes it very
difficult to find the reason for failure.

Fixes #5176
This commit is contained in:
Aditya Toshniwal 2020-02-11 14:28:57 +05:30 committed by Akshay Joshi
parent 2ae279a382
commit 019932c323
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_19.rst
View File

@ -14,6 +14,7 @@ New features
Housekeeping Housekeeping
************ ************
| `Issue #5176 <https://redmine.postgresql.org/issues/5176>`_ - Enhance logging by tracking stdout and stderr of subprocess when log level set to DEBUG.
Bug fixes Bug fixes
********* *********

21
web/pgadmin/misc/bgprocess/processes.py
View File

@ -18,7 +18,8 @@ import psutil
from abc import ABCMeta, abstractproperty, abstractmethod from abc import ABCMeta, abstractproperty, abstractmethod
from datetime import datetime from datetime import datetime
from pickle import dumps, loads from pickle import dumps, loads
from subprocess import Popen from subprocess import Popen, PIPE
import logging
from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding, \ from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding, \
get_complete_file_path get_complete_file_path
@ -382,6 +383,24 @@ class BatchProcess(object):
# Explicitly ignoring signals in the child process # Explicitly ignoring signals in the child process
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
# if in debug mode, wait for process to complete and
# get the stdout and stderr of popen.
if config.CONSOLE_LOG_LEVEL <= logging.DEBUG:
p = Popen(
cmd, close_fds=True, stdout=PIPE, stderr=PIPE, stdin=None,
preexec_fn=preexec_function, env=env
)
output, errors = p.communicate()
output = output.decode() \
if hasattr(output, 'decode') else output
errors = errors.decode() \
if hasattr(errors, 'decode') else errors
current_app.logger.debug(
'Process Watcher Out:{0}'.format(output))
current_app.logger.debug(
'Process Watcher Err:{0}'.format(errors))
else:
p = Popen( p = Popen(
cmd, close_fds=True, stdout=None, stderr=None, stdin=None, cmd, close_fds=True, stdout=None, stderr=None, stdin=None,
preexec_fn=preexec_function, env=env preexec_fn=preexec_function, env=env