corrections to IInitiator refactor; add ResetOnXXX to executor.cfg

connamara · Oct 20, 2011 · 7d74d6f · 7d74d6f
1 parent 90ac20d
commit 7d74d6f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/Examples/Executor/executor.cfg b/Examples/Executor/executor.cfg
@@ -6,6 +6,9 @@ StartTime=00:00:00
 EndTime=00:00:00
 FileLogPath=log
 UseDataDictionary=Y
+ResetOnLogon=Y
+ResetOnLogout=Y
+ResetOnDisconnect=Y
 
 [SESSION]
 BeginString=FIX.4.0

diff --git a/QuickFIX.NET/AbstractInitiator.cs b/QuickFIX.NET/AbstractInitiator.cs
@@ -3,7 +3,7 @@
 
 namespace QuickFix
 {
-    public abstract class AbstractInitiator
+    public abstract class AbstractInitiator : IInitiator
     {
         private object sync_ = new object();
         private Dictionary<SessionID,Session> sessions_ = new Dictionary<SessionID, Session>();
@@ -112,7 +112,6 @@ public bool IsLoggedOn()
         {
             lock (sync_)
             {
-
                 foreach (SessionID sessionID in connected_)
                 {
                     if (Session.LookupSession(sessionID).IsLoggedOn)

diff --git a/QuickFIX.NET/IInitiator.cs b/QuickFIX.NET/IInitiator.cs
@@ -18,29 +18,5 @@ public interface IInitiator
         void Stop(bool force);
 
         bool IsLoggedOn();
-
-        /// <summary>
-        /// Start connecting to targets.
-        /// </summary>
-        void OnStart();
-
-        /// <summary>
-        /// Connect and poll for events.
-        /// </summary>
-        /// <param name="timeout"></param>
-        /// <returns></returns>
-        bool OnPoll(double timeout);
-
-        /// <summary>
-        /// Stop a running initiator.
-        /// </summary>
-        void OnStop();
-
-        /// <summary>
-        /// Connect a session to its target.
-        /// </summary>
-        /// <param name="sessionID"></param>
-        /// <param name="settings"></param>
-        void DoConnect(SessionID sessionID, QuickFix.Dictionary settings);
     }
 }