Changeset 101918 in vbox

Timestamp:

Nov 7, 2023 9:44:49 AM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/python: Get rid of the log to mozilla console service code because it isn't used (and even if there is no listener ever registered for the console service anywhere so it would just go straight to /dev/null anyway), bugref:10545

Location:

trunk/src/libs/xpcom18a4/python

Files:

• __init__.py (modified) (3 diffs)
• src/module/_xpcom.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/__init__.py

@@ -90 +90 @@
         Exception.__init__(self, errno, *args, **kw)
 
-# Logging support - setup the 'xpcom' logger to write to the Mozilla
-# console service, and also to sys.stderr, or optionally a file.
+# Logging support - setup the 'xpcom' logger to write to sys.stderr,
+# or optionally a file.
 # Environment variables supports:
 # PYXPCOM_LOG_FILE=filename - if set, used instead of sys.stderr.
@@ -97 +97 @@
 #                           constant (eg, 'debug', 'error')
 # Later it may make sense to allow a different log level to be set for
-# the file than for the console service.
+# the file.
 import logging
-class ConsoleServiceStream:
-    # enough of a stream to keep logging happy
-    def flush(self):
-        pass
-    def write(self, msg):
-        import xpcom._xpcom as _xpcom
-        _xpcom.LogConsoleMessage(msg)
-    def close(self):
-        pass
-
 def setupLogging():
     import os
     if sys.version_info[0] <= 2:
         import threading, thread
-    hdlr = logging.StreamHandler(ConsoleServiceStream())
-    fmt = logging.Formatter(logging.BASIC_FORMAT)
-    hdlr.setFormatter(fmt)
-    # There is a bug in 2.3 and 2.4.x logging module in that it doesn't
-    # use an RLock, leading to deadlocks in some cases (specifically,
-    # logger.warning("ob is %r", ob), and where repr(ob) itself tries to log)
-    # Later versions of logging use an RLock, so we detect an "old" style
-    # handler and update its lock
-    if sys.version_info[0] <= 2:
-        if type(hdlr.lock) == thread.LockType:
-            hdlr.lock = threading.RLock()
 
-    logger.addHandler(hdlr)
-    # The console handler in mozilla does not go to the console!?
     # Add a handler to print to stderr, or optionally a file
     # PYXPCOM_LOG_FILE can specify a filename
@@ -171 +148 @@
 # Cleanup namespace - but leave 'logger' there for people to use, so they
 # don't need to know the exact name of the logger.
-del ConsoleServiceStream, logging, setupLogging
+del logging, setupLogging

trunk/src/libs/xpcom18a4/python/src/module/_xpcom.cpp

@@ -551 +551 @@
 }
 
-// Writes a message to the console service.  This could be done via pure
-// Python code, but is useful when the logging code is actually the
-// xpcom .py framework itself (ie, we don't want our logging framework to
-// call back into the very code generating the log messages!
-PyObject *LogConsoleMessage(PyObject *self, PyObject *args)
-{
-        char *msg;
-        if (!PyArg_ParseTuple(args, "s", &msg))
-                return NULL;
-
-        nsCOMPtr<nsIConsoleService> consoleService = do_GetService(NS_CONSOLESERVICE_CONTRACTID);
-        if (consoleService)
-                consoleService->LogStringMessage(NS_ConvertASCIItoUCS2(msg).get());
-        else {
-        // This either means no such service, or in shutdown - hardly worth
-        // the warning, and not worth reporting an error to Python about - its
-        // log handler would just need to catch and ignore it.
-        // And as this is only called by this logging setup, any messages should
-        // still go to stderr or a logfile.
-                NS_WARNING("pyxpcom can't log console message.");
-        }
-
-        Py_INCREF(Py_None);
-        return Py_None;
-}
-
 #ifdef VBOX
 
@@ -740 +714 @@
         {"GetSpecialDirectory", PyGetSpecialDirectory, 1},
         {"AllocateBuffer", AllocateBuffer, 1},
-        {"LogConsoleMessage", LogConsoleMessage, 1, "Write a message to the xpcom console service"},
         {"MakeVariant", PyXPCOMMethod_MakeVariant, 1},
         {"GetVariantValue", PyXPCOMMethod_GetVariantValue, 1},