[geary/mjog/logging-improvements: 8/23] Geary: Update IMAP and SMTP classes so logging domains are public

[Michael Gratton <mjog src gnome org>]

commit 972744c5dc55bbe3b83fd157fe31801572886878
Author: Michael Gratton <mike vee net>
Date:   Wed Apr 15 16:49:19 2020 +1000

    Geary: Update IMAP and SMTP classes so logging domains are public
    
    The client will need to access them so that it can (un)suppress them
    as needed.

 src/engine/imap-engine/imap-engine-replay-queue.vala  |  4 +---
 src/engine/imap/api/imap-client-service.vala          | 13 +++++++++++--
 src/engine/imap/transport/imap-client-connection.vala |  4 +---
 src/engine/imap/transport/imap-deserializer.vala      |  5 +----
 src/engine/smtp/smtp-client-connection.vala           |  5 ++---
 src/engine/smtp/smtp-client-service.vala              |  5 ++++-
 6 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/src/engine/imap-engine/imap-engine-replay-queue.vala 
b/src/engine/imap-engine/imap-engine-replay-queue.vala
index 8e74e484..121baafc 100644
--- a/src/engine/imap-engine/imap-engine-replay-queue.vala
+++ b/src/engine/imap-engine/imap-engine-replay-queue.vala
@@ -15,8 +15,6 @@
  */
 private class Geary.ImapEngine.ReplayQueue : BaseObject, Logging.Source {
 
-    /** The GLib logging domain used by this class. */
-    public const string LOGGING_DOMAIN = Logging.DOMAIN + ".Repq";
 
     // Maximum number of times a retry-able operation should be
     // retried before failing. It's set to 1 since we only attempt to
@@ -106,7 +104,7 @@ private class Geary.ImapEngine.ReplayQueue : BaseObject, Logging.Source {
 
     /** {@inheritDoc} */
     public override string logging_domain {
-        get { return LOGGING_DOMAIN; }
+        get { return Imap.ClientService.REPLAY_QUEUE_LOGGING_DOMAIN; }
     }
 
     /** {@inheritDoc} */
diff --git a/src/engine/imap/api/imap-client-service.vala b/src/engine/imap/api/imap-client-service.vala
index d961793e..a9feabd9 100644
--- a/src/engine/imap/api/imap-client-service.vala
+++ b/src/engine/imap/api/imap-client-service.vala
@@ -19,12 +19,21 @@
  *
  * This class is not thread-safe.
  */
-internal class Geary.Imap.ClientService : Geary.ClientService {
+public class Geary.Imap.ClientService : Geary.ClientService {
 
 
-    /** The GLib logging domain used by this class. */
+    /** The GLib logging domain used for IMAP sub-system logging. */
     public const string LOGGING_DOMAIN = Logging.DOMAIN + ".Imap";
 
+    /** The GLib logging domain used for IMAP protocol logging. */
+    public const string PROTOCOL_LOGGING_DOMAIN = Logging.DOMAIN + ".Imap.Net";
+
+    /** The GLib logging domain used for IMAP de-serialisation logging. */
+    public const string DESERIALISATION_LOGGING_DOMAIN = Logging.DOMAIN + ".Imap.Deser";
+
+    /** The GLib logging domain used for IMAP replay-queue logging. */
+    public const string REPLAY_QUEUE_LOGGING_DOMAIN = Logging.DOMAIN + ".Imap.Replay";
+
     private const int DEFAULT_MIN_POOL_SIZE = 1;
     private const int DEFAULT_MAX_FREE_SIZE = 1;
     private const int CHECK_NOOP_THRESHOLD_SEC = 5;
diff --git a/src/engine/imap/transport/imap-client-connection.vala 
b/src/engine/imap/transport/imap-client-connection.vala
index ac2f2585..31cee9bc 100644
--- a/src/engine/imap/transport/imap-client-connection.vala
+++ b/src/engine/imap/transport/imap-client-connection.vala
@@ -8,8 +8,6 @@
 
 public class Geary.Imap.ClientConnection : BaseObject, Logging.Source {
 
-    /** The GLib logging domain used by this class. */
-    public const string LOGGING_DOMAIN = ClientService.LOGGING_DOMAIN + ".Net";
 
     /**
      * Default socket timeout duration.
@@ -63,7 +61,7 @@ public class Geary.Imap.ClientConnection : BaseObject, Logging.Source {
 
     /** {@inheritDoc} */
     public override string logging_domain {
-        get { return LOGGING_DOMAIN; }
+        get { return ClientService.PROTOCOL_LOGGING_DOMAIN; }
     }
 
     /** {@inheritDoc} */
diff --git a/src/engine/imap/transport/imap-deserializer.vala 
b/src/engine/imap/transport/imap-deserializer.vala
index 481314a3..00a2cf92 100644
--- a/src/engine/imap/transport/imap-deserializer.vala
+++ b/src/engine/imap/transport/imap-deserializer.vala
@@ -27,9 +27,6 @@
 
 public class Geary.Imap.Deserializer : BaseObject, Logging.Source {
 
-    /** The GLib logging domain used by this class. */
-    public const string LOGGING_DOMAIN = ClientService.LOGGING_DOMAIN + ".Des";
-
 
     private const size_t MAX_BLOCK_READ_SIZE = 4096;
 
@@ -85,7 +82,7 @@ public class Geary.Imap.Deserializer : BaseObject, Logging.Source {
 
     /** {@inheritDoc} */
     public override string logging_domain {
-        get { return LOGGING_DOMAIN; }
+        get { return ClientService.DESERIALISATION_LOGGING_DOMAIN; }
     }
 
     /** {@inheritDoc} */
diff --git a/src/engine/smtp/smtp-client-connection.vala b/src/engine/smtp/smtp-client-connection.vala
index 9b698941..fefd8ce0 100644
--- a/src/engine/smtp/smtp-client-connection.vala
+++ b/src/engine/smtp/smtp-client-connection.vala
@@ -9,16 +9,15 @@
 /** A network connection to a SMTP service. */
 internal class Geary.Smtp.ClientConnection : BaseObject, Logging.Source {
 
-    /** The GLib logging domain used by this class. */
-    public const string LOGGING_DOMAIN = ClientService.LOGGING_DOMAIN + ".Net";
 
     public const uint DEFAULT_TIMEOUT_SEC = 20;
 
+
     public Geary.Smtp.Capabilities? capabilities { get; private set; default = null; }
 
     /** {@inheritDoc} */
     public override string logging_domain {
-        get { return LOGGING_DOMAIN; }
+        get { return ClientService.PROTOCOL_LOGGING_DOMAIN; }
     }
 
     /** {@inheritDoc} */
diff --git a/src/engine/smtp/smtp-client-service.vala b/src/engine/smtp/smtp-client-service.vala
index 3a0c786e..fa86226c 100644
--- a/src/engine/smtp/smtp-client-service.vala
+++ b/src/engine/smtp/smtp-client-service.vala
@@ -15,9 +15,12 @@
 public class Geary.Smtp.ClientService : Geary.ClientService {
 
 
-    /** The GLib logging domain used by this class. */
+    /** The GLib logging domain used for SMTP sub-system logging. */
     public const string LOGGING_DOMAIN = Logging.DOMAIN + ".Smtp";
 
+    /** The GLib logging domain used for SMTP protocol logging. */
+    public const string PROTOCOL_LOGGING_DOMAIN = Logging.DOMAIN + ".Smtp.Net";
+
 
     // Used solely for debugging, hence "(no subject)" not marked for
     // translation