Merge pull request #712 from hlibman-connamara/reset_seq_time

Change ResetSeqTime to time.Time based on the config's timeZone

Author: ackleymi

internal/session_settings.go

@@ -18,7 +18,8 @@ type SessionSettings struct {
 	SkipCheckLatency             bool
 	MaxLatency                   time.Duration
 	DisableMessagePersist        bool
-	ResetSeqTime                 TimeOfDay
+	TimeZone                     *time.Location
+	ResetSeqTime                 time.Time
 	EnableResetSeqTime           bool
 
 	// Required on logon for FIX.T.1 messages.

session_factory.go

@@ -63,6 +63,8 @@ type sessionFactory struct {
 	BuildInitiators bool
 }
 
+const shortForm = "15:04:05"
+
 // Creates Session, associates with internal session registry.
 func (f sessionFactory) createSession(
 	sessionID SessionID, storeFactory MessageStoreFactory, settings *SessionSettings,
@@ -280,6 +282,7 @@ func (f sessionFactory) newSession(
 				return
 			}
 		}
+		s.TimeZone = loc
 
 		if !settings.HasSetting(config.StartDay) && !settings.HasSetting(config.EndDay) {
 			var weekdays []time.Weekday
@@ -354,11 +357,11 @@ func (f sessionFactory) newSession(
 			return
 		}
 
-		var seqTime internal.TimeOfDay
-		if seqTime, err = internal.ParseTimeOfDay(seqTimeStr); err != nil {
+		var seqTime time.Time
+		if seqTime, err = time.ParseInLocation(shortForm, seqTimeStr, s.TimeZone); err != nil {
 			err = errors.Wrapf(
 				err, "problem parsing time of day '%v' for setting '%v",
-				settings.settings[config.StartTime], config.StartTime,
+				settings.settings[config.ResetSeqTime], config.ResetSeqTime,
 			)
 			return
 		}

session_state.go

@@ -157,8 +157,9 @@ func (sm *stateMachine) CheckSessionTime(session *session, now time.Time) {
 
 func (sm *stateMachine) CheckResetTime(session *session, now time.Time) {
 	if session.EnableResetSeqTime {
-		ts := internal.NewTimeOfDay(now.Clock())
-		if session.ResetSeqTime == ts {
+		if session.ResetSeqTime.Hour() == now.Hour() &&
+			session.ResetSeqTime.Minute() == now.Minute() &&
+			session.ResetSeqTime.Second() == now.Second() {
 			session.sendLogonInReplyTo(true, nil)
 		}
 	}

session_test.go

@@ -1007,7 +1007,7 @@ func (s *SessionSuite) TestSeqNumResetTime() {
 	s.SetupTest()
 
 	now := time.Now().UTC()
-	s.session.ResetSeqTime = internal.NewTimeOfDay(now.Clock())
+	s.session.ResetSeqTime = now
 	s.session.EnableResetSeqTime = true
 
 	s.IncrNextSenderMsgSeqNum()