Merge pull request #320 from quickfix-j/threaded-socket-initiator-reconnect-threads

Add reconnectThreads functionality to ThreadedSocketInitiator.
Improved error message in AbstractSocketAcceptor/Initiator

Author: chrjohn

quickfixj-core/src/main/java/quickfix/ThreadedSocketInitiator.java

@@ -31,7 +31,7 @@ public class ThreadedSocketInitiator extends AbstractSocketInitiator {
 
     private ThreadedSocketInitiator(Builder builder) throws ConfigError {
         super(builder.application, builder.messageStoreFactory, builder.settings,
-                builder.logFactory, builder.messageFactory);
+                builder.logFactory, builder.messageFactory, builder.numReconnectThreads);
 
         if (builder.queueCapacity >= 0) {
             eventHandlingStrategy
@@ -47,10 +47,18 @@ public static Builder newBuilder() {
     }
 
     public static final class Builder extends AbstractSessionConnectorBuilder<Builder, ThreadedSocketInitiator> {
+        
+        int numReconnectThreads = 3;
+        
         private Builder() {
             super(Builder.class);
         }
 
+        public Builder withReconnectThreads(int numReconnectThreads) throws ConfigError {
+            this.numReconnectThreads = numReconnectThreads;
+            return this;
+        }
+
         @Override
         protected ThreadedSocketInitiator doBuild() throws ConfigError {
             return new ThreadedSocketInitiator(this);

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

@@ -235,7 +235,7 @@ private void createSessions(SessionSettings settings) throws ConfigError, FieldC
                     }
                 } catch (Throwable t) {
                     if (continueInitOnError) {
-                        log.error("error during session initialization, continuing...", t);
+                        log.error("error during session initialization for {}, continuing...", sessionID, t);
                     } else {
                         throw t instanceof ConfigError ? (ConfigError) t : new ConfigError(
                                 "error during session initialization", t);

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

@@ -216,7 +216,7 @@ private void createSessions() throws ConfigError, FieldConvertError {
                     }
                 } catch (final Throwable e) {
                     if (continueInitOnError) {
-                        log.error("error during session initialization, continuing...", e);
+                        log.error("error during session initialization for {}, continuing...", sessionID, e);
                     } else {
                         throw e instanceof ConfigError ? (ConfigError) e : new ConfigError(
                                 "error during session initialization", e);