From 6436c1cafa6753267dd3e3fdb5e0e760d5bfa93e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 10 Mar 2019 10:27:07 +0100
Subject: [PATCH] Change logging domains

---
 acronyms_expander/acronyms_expander.py      | 2 +-
 birthday_reminder/plugin.py                 | 2 +-
 clients_icons/clients_icons.py              | 2 +-
 form_handler/plugin.py                      | 2 +-
 now_listen/now_listen.py                    | 2 +-
 omemo/file_crypto.py                        | 2 +-
 openpgp/backend/gpgme.py                    | 2 +-
 openpgp/backend/pygpg.py                    | 2 +-
 openpgp/backend/sql.py                      | 2 +-
 openpgp/gtk/key.py                          | 2 +-
 openpgp/gtk/wizard.py                       | 2 +-
 openpgp/modules/key_store.py                | 2 +-
 openpgp/modules/openpgp.py                  | 2 +-
 openpgp/pgpplugin.py                        | 2 +-
 pgp/pgpplugin.py                            | 2 +-
 plugin_installer/plugin_installer.py        | 2 +-
 set_location/set_location.py                | 2 +-
 syntax_highlight/README.md                  | 2 +-
 syntax_highlight/chat_syntax_highlighter.py | 2 +-
 syntax_highlight/gtkformatter.py            | 2 +-
 syntax_highlight/syntax_highlight.py        | 2 +-
 url_image_preview/http_functions.py         | 2 +-
 url_image_preview/url_image_preview.py      | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/acronyms_expander/acronyms_expander.py b/acronyms_expander/acronyms_expander.py
index 3877648..d9f395e 100644
--- a/acronyms_expander/acronyms_expander.py
+++ b/acronyms_expander/acronyms_expander.py
@@ -31,7 +31,7 @@ from gajim.plugins.plugins_i18n import _
 from acronyms_expander.acronyms import DEFAULT_DATA
 from acronyms_expander.gtk.config import ConfigDialog
 
-log = logging.getLogger('gajim.plugin_system.acronyms')
+log = logging.getLogger('gajim.p.acronyms')
 
 
 class AcronymsExpanderPlugin(GajimPlugin):
diff --git a/birthday_reminder/plugin.py b/birthday_reminder/plugin.py
index 5e3ecdc..124b3c2 100644
--- a/birthday_reminder/plugin.py
+++ b/birthday_reminder/plugin.py
@@ -27,7 +27,7 @@ from gajim.plugins import GajimPlugin
 from gajim.plugins.plugins_i18n import _
 
 
-log = logging.getLogger('gajim.plugin_system.birthday')
+log = logging.getLogger('gajim.p.birthday')
 
 TITLE = _('%s has birthday today')
 TEXT = _('Send him a message')
diff --git a/clients_icons/clients_icons.py b/clients_icons/clients_icons.py
index 80f9124..10679e9 100644
--- a/clients_icons/clients_icons.py
+++ b/clients_icons/clients_icons.py
@@ -20,7 +20,7 @@ from gajim.common import caps_cache
 from gajim.gtk.util import load_icon
 
 
-log = logging.getLogger('gajim.plugin_system.client_icons')
+log = logging.getLogger('gajim.p.client_icons')
 
 
 class ClientsIconsPlugin(GajimPlugin):
diff --git a/form_handler/plugin.py b/form_handler/plugin.py
index bf8d785..ecae07c 100644
--- a/form_handler/plugin.py
+++ b/form_handler/plugin.py
@@ -27,7 +27,7 @@ from gajim.plugins.plugins_i18n import _
 from form_handler.gtk.util import get_button
 from form_handler.gtk.form import FormDialog
 
-log = logging.getLogger('gajim.plugin_system.form_handler')
+log = logging.getLogger('gajim.p.form_handler')
 
 
 class FormHandlerPlugin(GajimPlugin):
diff --git a/now_listen/now_listen.py b/now_listen/now_listen.py
index 6f2dd78..1d7f6a5 100644
--- a/now_listen/now_listen.py
+++ b/now_listen/now_listen.py
@@ -12,7 +12,7 @@ from gajim.plugins.plugins_i18n import _
 from gajim.common.dbus.music_track import MusicTrackListener
 
 
-log = logging.getLogger('gajim.plugin_system.now_listen')
+log = logging.getLogger('gajim.p.now_listen')
 
 
 class NowListenPlugin(GajimPlugin):
diff --git a/omemo/file_crypto.py b/omemo/file_crypto.py
index a4ed30c..a7e6825 100644
--- a/omemo/file_crypto.py
+++ b/omemo/file_crypto.py
@@ -42,7 +42,7 @@ from omemo.backend.aes import aes_decrypt_file
 if sys.platform in ('win32', 'darwin'):
     import certifi
 
-log = logging.getLogger('gajim.plugin_system.omemo.filedecryption')
+log = logging.getLogger('gajim.p.omemo.filedecryption')
 
 DIRECTORY = os.path.join(configpaths.get('MY_DATA'), 'downloads')
 
diff --git a/openpgp/backend/gpgme.py b/openpgp/backend/gpgme.py
index 4058e27..02661e7 100644
--- a/openpgp/backend/gpgme.py
+++ b/openpgp/backend/gpgme.py
@@ -26,7 +26,7 @@ from gajim.common import app
 KeyringItem = namedtuple('KeyringItem',
                          'type keyid userid fingerprint')
 
-log = logging.getLogger('gajim.plugin_system.openpgp.pgpme')
+log = logging.getLogger('gajim.p.openpgp.pgpme')
 
 
 class PGPContext():
diff --git a/openpgp/backend/pygpg.py b/openpgp/backend/pygpg.py
index fa295aa..b7cc838 100644
--- a/openpgp/backend/pygpg.py
+++ b/openpgp/backend/pygpg.py
@@ -24,7 +24,7 @@ from gajim.common import app
 
 from openpgp.modules.util import DecryptionFailed
 
-log = logging.getLogger('gajim.plugin_system.openpgp.pygnupg')
+log = logging.getLogger('gajim.p.openpgp.pygnupg')
 
 KeyringItem = namedtuple('KeyringItem', 'jid keyid fingerprint')
 
diff --git a/openpgp/backend/sql.py b/openpgp/backend/sql.py
index 9ebe9ce..d15ded6 100644
--- a/openpgp/backend/sql.py
+++ b/openpgp/backend/sql.py
@@ -20,7 +20,7 @@ from collections import namedtuple
 
 from nbxmpp import JID
 
-log = logging.getLogger('gajim.plugin_system.openpgp.sql')
+log = logging.getLogger('gajim.p.openpgp.sql')
 
 TABLE_LAYOUT = '''
     CREATE TABLE contacts (
diff --git a/openpgp/gtk/key.py b/openpgp/gtk/key.py
index be66e2c..fee5cda 100644
--- a/openpgp/gtk/key.py
+++ b/openpgp/gtk/key.py
@@ -27,7 +27,7 @@ from gajim.plugins.plugins_i18n import _
 
 from openpgp.modules.util import Trust
 
-log = logging.getLogger('gajim.plugin_system.openpgp.keydialog')
+log = logging.getLogger('gajim.p.openpgp.keydialog')
 
 TRUST_DATA = {
     Trust.NOT_TRUSTED: ('dialog-error-symbolic',
diff --git a/openpgp/gtk/wizard.py b/openpgp/gtk/wizard.py
index 0cff1c8..c1cfff4 100644
--- a/openpgp/gtk/wizard.py
+++ b/openpgp/gtk/wizard.py
@@ -24,7 +24,7 @@ from gi.repository import GLib
 from gajim.common import app
 from gajim.plugins.plugins_i18n import _
 
-log = logging.getLogger('gajim.plugin_system.openpgp.wizard')
+log = logging.getLogger('gajim.p.openpgp.wizard')
 
 
 class Page(IntEnum):
diff --git a/openpgp/modules/key_store.py b/openpgp/modules/key_store.py
index 0d3c640..ad5112a 100644
--- a/openpgp/modules/key_store.py
+++ b/openpgp/modules/key_store.py
@@ -18,7 +18,7 @@ import logging
 
 from openpgp.modules.util import Trust
 
-log = logging.getLogger('gajim.plugin_system.openpgp.store')
+log = logging.getLogger('gajim.p.openpgp.store')
 
 
 class KeyData:
diff --git a/openpgp/modules/openpgp.py b/openpgp/modules/openpgp.py
index a91da26..ee1b094 100644
--- a/openpgp/modules/openpgp.py
+++ b/openpgp/modules/openpgp.py
@@ -46,7 +46,7 @@ from openpgp.backend.sql import Storage
 from openpgp.backend.pygpg import PGPContext
 
 
-log = logging.getLogger('gajim.plugin_system.openpgp')
+log = logging.getLogger('gajim.p.openpgp')
 
 
 # Module name
diff --git a/openpgp/pgpplugin.py b/openpgp/pgpplugin.py
index c2e21d5..a8e42dd 100644
--- a/openpgp/pgpplugin.py
+++ b/openpgp/pgpplugin.py
@@ -42,7 +42,7 @@ except ImportError as e:
 else:
     ERROR_MSG = None
 
-log = logging.getLogger('gajim.plugin_system.openpgp')
+log = logging.getLogger('gajim.p.openpgp')
 
 
 class OpenPGPPlugin(GajimPlugin):
diff --git a/pgp/pgpplugin.py b/pgp/pgpplugin.py
index b4182de..5fb2ae7 100644
--- a/pgp/pgpplugin.py
+++ b/pgp/pgpplugin.py
@@ -36,7 +36,7 @@ from gajim.gtk.dialogs import ErrorDialog
 from gajim.gtk.dialogs import InformationDialog
 from gajim.gtk.dialogs import YesNoDialog
 
-log = logging.getLogger('gajim.plugin_system.oldpgp')
+log = logging.getLogger('gajim.p.oldpgp')
 
 ERROR_MSG = ''
 if not app.is_installed('GPG'):
diff --git a/plugin_installer/plugin_installer.py b/plugin_installer/plugin_installer.py
index a1cd9bd..a115f28 100644
--- a/plugin_installer/plugin_installer.py
+++ b/plugin_installer/plugin_installer.py
@@ -50,7 +50,7 @@ from gajim.gtk.dialogs import YesNoDialog
 from gajim.gtk.dialogs import ConfirmationDialogCheck
 from gajim.gtkgui_helpers import get_action
 
-log = logging.getLogger('gajim.plugin_system.plugin_installer')
+log = logging.getLogger('gajim.p.plugin_installer')
 
 PLUGINS_URL = 'https://ftp.gajim.org/plugins_master_zip/'
 MANIFEST_URL = 'https://ftp.gajim.org/plugins_master_zip/manifests.zip'
diff --git a/set_location/set_location.py b/set_location/set_location.py
index cd203de..a836375 100644
--- a/set_location/set_location.py
+++ b/set_location/set_location.py
@@ -19,7 +19,7 @@ from gajim import gtkgui_helpers
 from gajim.gtk.dialogs import InputDialog, WarningDialog
 
 
-log = logging.getLogger('gajim.plugin_system.set_location')
+log = logging.getLogger('gajim.p.set_location')
 
 CHAMPLAIN_AVAILABLE = True
 
diff --git a/syntax_highlight/README.md b/syntax_highlight/README.md
index 0923de0..0199de3 100644
--- a/syntax_highlight/README.md
+++ b/syntax_highlight/README.md
@@ -103,7 +103,7 @@ for this plugin and/or filter log messages.
 
 Run
 ```
-gajim --loglevel gajim.plugin_system.syntax_highlight=DEBUG
+gajim --loglevel gajim.p.syntax_highlight=DEBUG
 ```
 in a terminal to display the debug messages.
 
diff --git a/syntax_highlight/chat_syntax_highlighter.py b/syntax_highlight/chat_syntax_highlighter.py
index 25645ff..63c9508 100644
--- a/syntax_highlight/chat_syntax_highlighter.py
+++ b/syntax_highlight/chat_syntax_highlighter.py
@@ -11,7 +11,7 @@ from .gtkformatter import GTKFormatter
 from .types import MatchType, LineBreakOptions, CodeMarkerOptions
 
 
-log = logging.getLogger('gajim.plugin_system.syntax_highlight')
+log = logging.getLogger('gajim.p.syntax_highlight')
 
 class ChatSyntaxHighlighter:
     def hide_code_markup(self, buf, start, end):
diff --git a/syntax_highlight/gtkformatter.py b/syntax_highlight/gtkformatter.py
index 68c4afc..75d6ce2 100644
--- a/syntax_highlight/gtkformatter.py
+++ b/syntax_highlight/gtkformatter.py
@@ -5,7 +5,7 @@ from gi.repository import Pango
 
 from pygments.formatter import Formatter
 from gajim.plugins.helpers import log
-log = logging.getLogger('gajim.plugin_system.syntax_highlight')
+log = logging.getLogger('gajim.p.syntax_highlight')
 
 class GTKFormatter(Formatter):
     name = 'GTK Formatter'
diff --git a/syntax_highlight/syntax_highlight.py b/syntax_highlight/syntax_highlight.py
index ac5a45d..fcbb7be 100644
--- a/syntax_highlight/syntax_highlight.py
+++ b/syntax_highlight/syntax_highlight.py
@@ -13,7 +13,7 @@ from gajim.plugins import GajimPlugin
 from .types import MatchType, LineBreakOptions, CodeMarkerOptions, \
                     PLUGIN_INTERNAL_NONE_LEXER_ID
 
-log = logging.getLogger('gajim.plugin_system.syntax_highlight')
+log = logging.getLogger('gajim.p.syntax_highlight')
 
 def try_loading_pygments():
     success = find_module('pygments') is not None
diff --git a/url_image_preview/http_functions.py b/url_image_preview/http_functions.py
index ea2d2b0..97e0f70 100644
--- a/url_image_preview/http_functions.py
+++ b/url_image_preview/http_functions.py
@@ -28,7 +28,7 @@ from gajim.plugins.plugins_i18n import _
 if os.name == 'nt':
     import certifi
 
-log = logging.getLogger('gajim.plugin_system.preview.http_functions')
+log = logging.getLogger('gajim.p.preview.http_functions')
 
 def get_http_head(account, url, verify):
     return _get_http_head_direct(url, verify)
diff --git a/url_image_preview/url_image_preview.py b/url_image_preview/url_image_preview.py
index 051a2ab..9c80acf 100644
--- a/url_image_preview/url_image_preview.py
+++ b/url_image_preview/url_image_preview.py
@@ -46,7 +46,7 @@ from gajim.gtk.filechoosers import FileSaveDialog
 from gajim.gtk.util import get_cursor
 
 
-log = logging.getLogger('gajim.plugin_system.preview')
+log = logging.getLogger('gajim.p.preview')
 
 ERROR_MSG = None
 try: