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

Added connected pgAdmin user and connection name in the log file. Fixes #6052

Browse Source 
Patch By: Nico T
This commit is contained in:
Akshay Joshi 2020-12-14 12:24:06 +05:30
parent 52780079f3
commit c4d9ef9210
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_30.rst
View File

@ -13,6 +13,7 @@ New features
Housekeeping Housekeeping
************ ************
| `Issue #6052 <https://redmine.postgresql.org/issues/6052>`_ - Added connected pgAdmin user and connection name in the log file.
Bug fixes Bug fixes
********* *********

48
web/pgadmin/utils/driver/psycopg2/connection.py
View File

@ -758,10 +758,16 @@ WHERE db.datname = current_database()""")
current_app.logger.warning('Error encoding query') current_app.logger.warning('Error encoding query')
pass pass
dsn = self.conn.get_dsn_parameters()
current_app.logger.log( current_app.logger.log(
25, 25,
"Execute (with server cursor) for server #{server_id} - " "Execute (with server cursor) by {pga_user} on "
"{db_user}@{db_host}/{db_name} #{server_id} - "
"{conn_id} (Query-id: {query_id}):\n{query}".format( "{conn_id} (Query-id: {query_id}):\n{query}".format(
pga_user=current_user.email,
db_user=dsn['user'],
db_host=dsn['host'],
db_name=dsn['dbname'],
server_id=self.manager.sid, server_id=self.manager.sid,
conn_id=self.conn_id, conn_id=self.conn_id,
query=query, query=query,
@ -905,10 +911,16 @@ WHERE db.datname = current_database()""")
return False, str(cur) return False, str(cur)
query_id = random.randint(1, 9999999) query_id = random.randint(1, 9999999)
dsn = self.conn.get_dsn_parameters()
current_app.logger.log( current_app.logger.log(
25, 25,
"Execute (scalar) for server #{server_id} - {conn_id} (Query-id: " "Execute (scalar) by {pga_user} on "
"{query_id}):\n{query}".format( "{db_user}@{db_host}/{db_name} #{server_id} - "
"{conn_id} (Query-id: {query_id}):\n{query}".format(
pga_user=current_user.email,
db_user=dsn['user'],
db_host=dsn['host'],
db_name=dsn['dbname'],
server_id=self.manager.sid, server_id=self.manager.sid,
conn_id=self.conn_id, conn_id=self.conn_id,
query=query, query=query,
@ -1046,10 +1058,16 @@ WHERE db.datname = current_database()""")
return False, str(cur) return False, str(cur)
query_id = random.randint(1, 9999999) query_id = random.randint(1, 9999999)
dsn = self.conn.get_dsn_parameters()
current_app.logger.log( current_app.logger.log(
25, 25,
"Execute (void) for server #{server_id} - {conn_id} (Query-id: " "Execute (void) by {pga_user} on "
"{query_id}):\n{query}".format( "{db_user}@{db_host}/{db_name} #{server_id} - "
"{conn_id} (Query-id: {query_id}):\n{query}".format(
pga_user=current_user.email,
db_user=dsn['user'],
db_host=dsn['host'],
db_name=dsn['dbname'],
server_id=self.manager.sid, server_id=self.manager.sid,
conn_id=self.conn_id, conn_id=self.conn_id,
query=query, query=query,
@ -1129,10 +1147,16 @@ WHERE db.datname = current_database()""")
return False, str(cur) return False, str(cur)
query_id = random.randint(1, 9999999) query_id = random.randint(1, 9999999)
dsn = self.conn.get_dsn_parameters()
current_app.logger.log( current_app.logger.log(
25, 25,
"Execute (2darray) for server #{server_id} - {conn_id} " "Execute (2darray) by {pga_user} on "
"(Query-id: {query_id}):\n{query}".format( "{db_user}@{db_host}/{db_name} #{server_id} - "
"{conn_id} (Query-id: {query_id}):\n{query}".format(
pga_user=current_user.email,
db_user=dsn['user'],
db_host=dsn['host'],
db_name=dsn['dbname'],
server_id=self.manager.sid, server_id=self.manager.sid,
conn_id=self.conn_id, conn_id=self.conn_id,
query=query, query=query,
@ -1182,10 +1206,16 @@ WHERE db.datname = current_database()""")
if not status: if not status:
return False, str(cur) return False, str(cur)
query_id = random.randint(1, 9999999) query_id = random.randint(1, 9999999)
dsn = self.conn.get_dsn_parameters()
current_app.logger.log( current_app.logger.log(
25, 25,
"Execute (dict) for server #{server_id} - {conn_id} (Query-id: " "Execute (dict) by {pga_user} on "
"{query_id}):\n{query}".format( "{db_user}@{db_host}/{db_name} #{server_id} - "
"{conn_id} (Query-id: {query_id}):\n{query}".format(
pga_user=current_user.email,
db_user=dsn['user'],
db_host=dsn['host'],
db_name=dsn['dbname'],
server_id=self.manager.sid, server_id=self.manager.sid,
conn_id=self.conn_id, conn_id=self.conn_id,
query=query, query=query,