From 237f50cfb5e251eadbf72b72d7d5f62cb7b55048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 10 Mar 2019 10:11:03 +0100
Subject: [PATCH] [omemo] Change logging domain

---
 omemo/backend/aes.py   | 2 +-
 omemo/gtk/config.py    | 2 +-
 omemo/gtk/key.py       | 2 +-
 omemo/modules/omemo.py | 5 +----
 omemo/plugin.py        | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/omemo/backend/aes.py b/omemo/backend/aes.py
index eec2b7c..175eac9 100644
--- a/omemo/backend/aes.py
+++ b/omemo/backend/aes.py
@@ -24,7 +24,7 @@ from cryptography.hazmat.primitives.ciphers import algorithms
 from cryptography.hazmat.primitives.ciphers.modes import GCM
 from cryptography.hazmat.backends import default_backend
 
-log = logging.getLogger('gajim.plugin_system.omemo')
+log = logging.getLogger('gajim.p.omemo')
 
 EncryptionResult = namedtuple('EncryptionResult', 'payload key iv')
 
diff --git a/omemo/gtk/config.py b/omemo/gtk/config.py
index 952d4b7..fb7f6ca 100644
--- a/omemo/gtk/config.py
+++ b/omemo/gtk/config.py
@@ -24,7 +24,7 @@ from gajim.plugins.helpers import get_builder
 
 from omemo.backend.util import get_fingerprint
 
-log = logging.getLogger('gajim.plugin_system.omemo')
+log = logging.getLogger('gajim.p.omemo')
 
 
 class OMEMOConfigDialog(GajimPluginConfigDialog):
diff --git a/omemo/gtk/key.py b/omemo/gtk/key.py
index f5d71fd..ea48c15 100644
--- a/omemo/gtk/key.py
+++ b/omemo/gtk/key.py
@@ -33,7 +33,7 @@ from omemo.gtk.util import Trust
 from omemo.backend.util import IdentityKeyExtended
 from omemo.backend.util import get_fingerprint
 
-log = logging.getLogger('gajim.plugin_system.omemo')
+log = logging.getLogger('gajim.p.omemo')
 
 
 TRUST_DATA = {
diff --git a/omemo/modules/omemo.py b/omemo/modules/omemo.py
index 75ca114..074c23d 100644
--- a/omemo/modules/omemo.py
+++ b/omemo/modules/omemo.py
@@ -18,7 +18,6 @@
 
 import os
 import time
-import logging
 
 import nbxmpp
 from nbxmpp.protocol import NodeProcessed
@@ -67,8 +66,6 @@ ALLOWED_TAGS = [
     ('origin-id', nbxmpp.NS_SID),
 ]
 
-log = logging.getLogger('gajim.plugin_system.omemo')
-
 ENCRYPTION_NAME = 'OMEMO'
 
 # Module name
@@ -87,7 +84,7 @@ class OMEMO(BaseModule):
     ]
 
     def __init__(self, con):
-        BaseModule.__init__(self, con, log)
+        BaseModule.__init__(self, con, plugin=True)
 
         self.handlers = [
             StanzaHandler(name='message',
diff --git a/omemo/plugin.py b/omemo/plugin.py
index d143953..584753e 100644
--- a/omemo/plugin.py
+++ b/omemo/plugin.py
@@ -44,7 +44,7 @@ PROTOBUF_MISSING = "OMEMO can't import Google Protobuf, you can find help in " \
 ERROR_MSG = ''
 
 
-log = logging.getLogger('gajim.plugin_system.omemo')
+log = logging.getLogger('gajim.p.omemo')
 if log.getEffectiveLevel() == logging.DEBUG:
     log_axolotl = logging.getLogger('axolotl')
     log_axolotl.setLevel(logging.DEBUG)