[geary/wip/789924-network-transition: 6/15] Minor deserialiser debug logging tidy up.



commit b5b0ad9746c764e6c2386e6847484289f0129c5c
Author: Michael James Gratton <mike vee net>
Date:   Tue Nov 7 11:21:44 2017 +1100

    Minor deserialiser debug logging tidy up.

 .../imap/transport/imap-client-connection.vala     |    5 +++--
 src/engine/imap/transport/imap-deserializer.vala   |   11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/engine/imap/transport/imap-client-connection.vala 
b/src/engine/imap/transport/imap-client-connection.vala
index f6978ef..bf7da00 100644
--- a/src/engine/imap/transport/imap-client-connection.vala
+++ b/src/engine/imap/transport/imap-client-connection.vala
@@ -488,10 +488,11 @@ public class Geary.Imap.ClientConnection : BaseObject {
             
             return;
         }
-        
+
         // Close the Serializer/Deserializer, as need to use the TLS streams
+        debug("[%s] Closing serializer to switch to TLS", to_string());
         yield close_channels_async(cancellable);
-        
+
         // wrap connection with TLS connection
         TlsClientConnection tls_cx = yield endpoint.starttls_handshake_async(cx, cancellable);
         
diff --git a/src/engine/imap/transport/imap-deserializer.vala 
b/src/engine/imap/transport/imap-deserializer.vala
index 7c24c9b..67e09c7 100644
--- a/src/engine/imap/transport/imap-deserializer.vala
+++ b/src/engine/imap/transport/imap-deserializer.vala
@@ -248,7 +248,6 @@ public class Geary.Imap.Deserializer : BaseObject {
         cancellable.cancel();
         
         // wait for outstanding I/O to exit
-        debug("[%s] Waiting for deserializer to close...", to_string());
         yield closed_semaphore.wait_async();
         debug("[%s] Deserializer closed", to_string());
     }
@@ -818,14 +817,14 @@ public class Geary.Imap.Deserializer : BaseObject {
 
     private uint on_error(uint state, uint event, void *user, Object? object, Error? err) {
         assert(err != null);
-        
-        debug("[%s] input error: %s", to_string(), err.message);
-        
+
         // only Cancellable allowed is internal used to notify when closed; all other errors should
         // be reported
-        if (!(err is IOError.CANCELLED))
+        if (!(err is IOError.CANCELLED)) {
+            debug("[%s] input error: %s", to_string(), err.message);
             receive_failure(err);
-        
+        }
+
         // always signal as closed and notify
         closed_semaphore.blind_notify();
         eos();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]