Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made the log method a weakreference #1671

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Made the log method a weakreference #1671

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f511222
Made the log method a weakreference
Feb 6, 2024
90cb3bb
Made changes to drop logging if program is being terminated. Credit t…
Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/extras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import os as _os
import time as _time
import re as _re
import weakref as _weakref
from collections import namedtuple, OrderedDict

import logging as _logging

import psycopg2
Expand Down Expand Up @@ -401,9 +401,15 @@ def initialize(self, logobj):
self._logobj = logobj
if _logging and isinstance(
logobj, (_logging.Logger, _logging.LoggerAdapter)):
self.log = self._logtologger
self._log = _weakref.WeakMethod(self._logtologger)
else:
self.log = self._logtofile
self._log = _weakref.WeakMethod(self._logtofile)

def log(self, *args, **kwargs):
"""
Public interface of the log method defined in initialize
"""
return self._log()(*args, **kwargs)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should check if self._log() returns None. In that case I think you can just plonk the message: it likely means that the program is being terminated.

Copy link
Author

@spatankar-dmpna spatankar-dmpna Feb 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you mean something like this?
`

if self._log():
     return self._log()(*args, **kwargs)

`

Copy link
Member

@dvarrazzo dvarrazzo Feb 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, more:

log = self._log()
if log:
    log(*args, **kwargs)

otherwise there is a race condition.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a 100% sure of this myself but wouldn't this replicate the same bound method issue again?

It is possible that the WeaktMethod does decrease the reference count even after we do this though.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a 100% sure of this myself but wouldn't this replicate the same bound method issue again?

No, because this would be into the log() function. log, here, is a local variable.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also wanted to ask if this issue might be happening in other parts. I could make the same changes there too.


def filter(self, msg, curs):
"""Filter the query before logging it.
Expand Down