Clarify error message text

Author: simonrob

emailproxy.py

@@ -4,7 +4,7 @@
 __author__ = 'Simon Robinson'
 __copyright__ = 'Copyright (c) 2022 Simon Robinson'
 __license__ = 'Apache 2.0'
-__version__ = '2022-10-24'  # ISO 8601 (YYYY-MM-DD)
+__version__ = '2022-11-01'  # ISO 8601 (YYYY-MM-DD)
 
 import argparse
 import base64
@@ -412,6 +412,11 @@ def get_account_with_catch_all_fallback(option):
                         AppConfig.save()
 
                     else:
+                        # we used to keep tokens until the last possible moment here, but it is simpler to just obtain a
+                        # new one within TOKEN_EXPIRY_MARGIN, particularly when in CCG or ROPCG flow modes where getting
+                        # a new token involves no user interaction (note that in interactive mode it would be better to
+                        # request a new token via the user before discarding the existing one, but since this happens
+                        # very infrequently, we don't add the extra complexity for just 10 extra minutes of token life)
                         access_token = None  # avoid trying invalid (or soon to be) tokens
                 else:
                     access_token = OAuth2Helper.decrypt(fernet, access_token)
@@ -1350,7 +1355,7 @@ def process_data(self, byte_data):
         # if authentication succeeds (or fails), remove our proxy from the client and ignore all further communication
         # don't use a regex here as the tag must match exactly; RFC 3501 specifies uppercase 'OK', so startswith is fine
         if str_response.startswith('%s OK' % self.client_connection.authentication_tag):
-            Log.info(self.info_string(), '[ Successfully authenticated IMAP connection - removing proxy ]')
+            Log.info(self.info_string(), '[ Successfully authenticated IMAP connection - releasing session ]')
             self.client_connection.authenticated = True
         elif str_response.startswith('%s NO' % self.client_connection.authentication_tag):
             super().process_data(byte_data)  # an error occurred - just send to the client and exit
@@ -1443,7 +1448,7 @@ def process_data(self, byte_data):
 
         elif self.client_connection.connection_state is POPOAuth2ClientConnection.STATE.XOAUTH2_CREDENTIALS_SENT:
             if str_data.startswith('+OK'):
-                Log.info(self.info_string(), '[ Successfully authenticated POP connection - removing proxy ]')
+                Log.info(self.info_string(), '[ Successfully authenticated POP connection - releasing session ]')
                 self.client_connection.authenticated = True
                 super().process_data(byte_data)
             else:
@@ -1539,7 +1544,7 @@ def process_data(self, byte_data):
 
         elif self.client_connection.connection_state is SMTPOAuth2ClientConnection.STATE.XOAUTH2_CREDENTIALS_SENT:
             if str_data.startswith('235'):
-                Log.info(self.info_string(), '[ Successfully authenticated SMTP connection - removing proxy ]')
+                Log.info(self.info_string(), '[ Successfully authenticated SMTP connection - releasing session ]')
                 self.client_connection.authenticated = True
                 super().process_data(byte_data)
             else:
@@ -2377,7 +2382,7 @@ def load_and_start_servers(self, icon=None, reload=True):
                     new_proxy.start()
                     self.proxies.append(new_proxy)
                 except Exception as e:
-                    Log.error('Error: unable to start server:', Log.error_string(e))
+                    Log.error('Error: unable to start', match.string, 'server:', Log.error_string(e))
                     server_start_error = True
 
         if server_start_error or server_load_error or len(self.proxies) <= 0: