codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On a 64bit platform with old plugins, the deprecation code was unable to find out which was the caller module. This might also happen on other platforms although I was unable to reproduce it on x86. Anyway, handle it cleanly.

This commit is contained in:
Pedro Algarvio 2011-01-01 18:33:41 +00:00
parent d1b4523733
commit 1f800bf49a
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deluge/log.py
View File

@ -263,21 +263,30 @@ class __BackwardsCompatibleLOG(object):
import warnings import warnings
logger_name = 'deluge' logger_name = 'deluge'
stack = inspect.stack() stack = inspect.stack()
module_stack = stack.pop(1) stack.pop(0) # The logging call from this module
module_stack = stack.pop(0) # The module that called the log function
caller_module = inspect.getmodule(module_stack[0]) caller_module = inspect.getmodule(module_stack[0])
# In some weird cases caller_module might be None, try to continue
caller_module_name = getattr(caller_module, '__name__', '')
warnings.warn_explicit(DEPRECATION_WARNING, DeprecationWarning, warnings.warn_explicit(DEPRECATION_WARNING, DeprecationWarning,
module_stack[1], module_stack[2], module_stack[1], module_stack[2],
caller_module.__name__) caller_module_name)
if caller_module:
for member in stack: for member in stack:
module = inspect.getmodule(member[0]) module = inspect.getmodule(member[0])
if not module: if not module:
continue continue
if module.__name__ in ('deluge.plugins.pluginbase', if module.__name__ in ('deluge.plugins.pluginbase',
'deluge.plugins.init'): 'deluge.plugins.init'):
logger_name += '.plugin.%s' % caller_module.__name__ logger_name += '.plugin.%s' % caller_module_name
# Monkey Patch The Plugin Module # Monkey Patch The Plugin Module
caller_module.log = logging.getLogger(logger_name) caller_module.log = logging.getLogger(logger_name)
break break
else:
logging.getLogger(logger_name).warning(
"Unable to monkey-patch the calling module's `log` attribute! "
"You should really update and rebuild your plugins..."
)
return getattr(logging.getLogger(logger_name), name) return getattr(logging.getLogger(logger_name), name)
LOG = __BackwardsCompatibleLOG() LOG = __BackwardsCompatibleLOG()