changed to log event warning message where applicable

Author: chrjohn

quickfixj-core/src/main/java/quickfix/mina/acceptor/AbstractSocketAcceptor.java

@@ -30,6 +30,7 @@
 import quickfix.DefaultSessionFactory;
 import quickfix.FieldConvertError;
 import quickfix.LogFactory;
+import quickfix.LogUtil;
 import quickfix.MessageFactory;
 import quickfix.MessageStoreFactory;
 import quickfix.RuntimeError;
@@ -117,6 +118,7 @@ protected synchronized void startAcceptingConnections() throws ConfigError {
                 ioAcceptor.bind(socketDescriptor.getAddress());
                 log.info("Listening for connections at {} for session(s) {}", address, socketDescriptor.getAcceptedSessions().keySet());
             } catch (IOException | GeneralSecurityException | ConfigError e) {
+                // we cannot log for a specific session here
                 if (continueInitOnError) {
                     log.warn("error during session initialization for session(s) {}, continuing...", socketDescriptor.getAcceptedSessions().keySet(), e);
                 } else {
@@ -183,8 +185,6 @@ && getSettings().getBool(sessionID, SSLSupport.SETTING_USE_SSL)) {
             if (acceptTransportType == ProtocolFactory.SOCKET) {
                 useSSL = true;
                 sslConfig = SSLSupport.getSslConfig(getSettings(), sessionID);
-            } else {
-                log.warn("SSL will not be enabled for transport type={}, session={}", acceptTransportType, sessionID);
             }
         }
 
@@ -214,6 +214,11 @@ && getSettings().getBool(sessionID, SSLSupport.SETTING_USE_SSL)) {
             descriptor.acceptSession(session);
             allSessions.put(sessionID, session);
         }
+        
+        if (acceptTransportType != ProtocolFactory.SOCKET
+                && getSettings().getBoolOrDefault(sessionID, SSLSupport.SETTING_USE_SSL, false)) {
+            LogUtil.logWarning(sessionID, "SSL is only supported for transport type SOCKET and will not be enabled for transport type=" + acceptTransportType);
+        }
     }
 
     private boolean equals(Object object1, Object object2) {
@@ -245,7 +250,7 @@ private void createSessions(SessionSettings settings, boolean continueInitOnErro
                 }
             } catch (Throwable t) {
                 if (continueInitOnError) {
-                    log.warn("error during session initialization for {}, continuing...", sessionID, t);
+                    LogUtil.logWarning(sessionID, "error during session initialization, continuing...", t);
                 } else {
                     throw t instanceof ConfigError ? (ConfigError) t : new ConfigError(
                             "error during session initialization", t);
@@ -329,6 +334,7 @@ public StaticAcceptorSessionProvider(final Map<SessionID, Session> acceptorSessi
             this.acceptorSessions = acceptorSessions;
         }
 
+        @Override
         public Session getSession(SessionID sessionID, SessionConnector connector) {
             return acceptorSessions.get(sessionID);
         }
@@ -349,6 +355,7 @@ public DefaultAcceptorSessionProvider(Map<SessionID, Session> acceptorSessions)
             this.acceptorSessions = acceptorSessions;
         }
 
+        @Override
         public Session getSession(SessionID sessionID, SessionConnector ignored) {
             Session session = acceptorSessions.get(sessionID);
             if (session == null) {

quickfixj-core/src/main/java/quickfix/mina/initiator/AbstractSocketInitiator.java

@@ -29,6 +29,7 @@
 import quickfix.FieldConvertError;
 import quickfix.Initiator;
 import quickfix.LogFactory;
+import quickfix.LogUtil;
 import quickfix.MessageFactory;
 import quickfix.MessageStoreFactory;
 import quickfix.Session;
@@ -123,7 +124,7 @@ private void createInitiator(final Session session, final boolean continueInitOn
             throw new ConfigError("Must specify at least one socket address");
         }
 
-        SocketAddress localAddress = getLocalAddress(settings, sessionID);
+        SocketAddress localAddress = getLocalAddress(settings, session);
 
         final NetworkingOptions networkingOptions = new NetworkingOptions(getSettings()
                 .getSessionProperties(sessionID, true));
@@ -182,18 +183,19 @@ && getSettings().isSetting(sessionID, Initiator.SETTING_PROXY_DOMAIN)) {
             initiators.add(ioSessionInitiator);
         } catch (ConfigError e) {
             if (continueInitOnError) {
-                log.warn("error during session initialization for {}, continuing...", sessionID, e);
+                LogUtil.logWarning(sessionID, "error during session initialization, continuing... ", e);
             } else {
                 throw e;
             }
         }
     }
 
     // QFJ-482
-    private SocketAddress getLocalAddress(SessionSettings settings, final SessionID sessionID)
+    private SocketAddress getLocalAddress(SessionSettings settings, final Session session)
             throws ConfigError, FieldConvertError {
         // Check if use of socket local/bind address
         SocketAddress localAddress = null;
+        SessionID sessionID = session.getSessionID();
         if (settings.isSetting(sessionID, Initiator.SETTING_SOCKET_LOCAL_HOST)) {
             String host = settings.getString(sessionID, Initiator.SETTING_SOCKET_LOCAL_HOST);
             if ("localhost".equals(host)) {
@@ -204,7 +206,7 @@ private SocketAddress getLocalAddress(SessionSettings settings, final SessionID
                 port = (int) settings.getLong(sessionID, Initiator.SETTING_SOCKET_LOCAL_PORT);
             }
             localAddress = ProtocolFactory.createSocketAddress(ProtocolFactory.SOCKET, host, port);
-            log.info("Using initiator local host: {}", localAddress);
+            session.getLog().onEvent("Using initiator local host: " + localAddress);
         }
         return localAddress;
     }
@@ -222,7 +224,7 @@ private void createSessions(boolean continueInitOnError) throws ConfigError, Fie
                     }
                 } catch (final Throwable e) {
                     if (continueInitOnError) {
-                        log.warn("error during session initialization for {}, continuing...", sessionID, e);
+                        LogUtil.logWarning(sessionID, "error during session initialization, continuing...", e);
                     } else {
                         throw e instanceof ConfigError ? (ConfigError) e : new ConfigError(
                                 "error during session initialization", e);