From 70bbd14b1ae122f2d1db7b8907d47394d549a149 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Tue, 8 Jun 2021 11:34:36 +0200 Subject: [PATCH] [mod] move hook to set Unix thread name into searx.unixthreadname requires setproctitle (but optional) --- searx/__init__.py | 1 + searx/unixthreadname.py | 20 ++++++++++++++++++++ searx/webapp.py | 15 --------------- 3 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 searx/unixthreadname.py diff --git a/searx/__init__.py b/searx/__init__.py index a65266de8..8452dd7b4 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -5,6 +5,7 @@ from os.path import dirname, abspath import logging +import searx.unixthreadname import searx.settings_loader from searx.settings_defaults import settings_set_defaults diff --git a/searx/unixthreadname.py b/searx/unixthreadname.py new file mode 100644 index 000000000..9a6f53813 --- /dev/null +++ b/searx/unixthreadname.py @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +# lint: pylint +""" +if setproctitle is installed. +set Unix thread name with the Python thread name +""" + +try: + import setproctitle +except ImportError: + pass +else: + import threading + old_thread_init = threading.Thread.__init__ + + def new_thread_init(self, *args, **kwargs): + # pylint: disable=protected-access, disable=c-extension-no-member, disable=missing-function-docstring + old_thread_init(self, *args, **kwargs) + setproctitle.setthreadtitle(self._name) + threading.Thread.__init__ = new_thread_init diff --git a/searx/webapp.py b/searx/webapp.py index 9c2374200..9ce23d3c1 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -111,21 +111,6 @@ from searx.network import stream as http_stream from searx.search.checker import get_result as checker_get_result from searx.settings_loader import get_default_settings_path -# set Unix thread name -try: - import setproctitle -except ImportError: - pass -else: - import threading - old_thread_init = threading.Thread.__init__ - - def new_thread_init(self, *args, **kwargs): - # pylint: disable=protected-access, disable=c-extension-no-member - old_thread_init(self, *args, **kwargs) - setproctitle.setthreadtitle(self._name) - threading.Thread.__init__ = new_thread_init - logger = logger.getChild('webapp') # check secret_key