Merge branch 'main' into fix/sequence_number_bug

Author: ackleymi

.github/workflows/ci.yaml

@@ -37,6 +37,9 @@ jobs:
     strategy:
       matrix:
         go: [1.21]
+        store-type:
+          - memory
+          - file
         fix-version:
           -
           - fix40
@@ -67,4 +70,5 @@ jobs:
           GO111MODULE: on
           MONGODB_TEST_CXN: mongodb://localhost:27017
           FIX_TEST: ${{ matrix.fix-version }}
+          STORE_TYPE: ${{ matrix.store-type }}
         run: if [ -z $FIX_TEST ]; then make build-src && make test-ci; else make generate-ci && make build && make $FIX_TEST; fi

Makefile

@@ -31,21 +31,21 @@ lint: linters-install
 build-test-srv:
 	cd _test; go build -o echo_server ./test-server/
 fix40:
-	cd _test; ./runat.sh $@.cfg 5001 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5001 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix41:
-	cd _test; ./runat.sh $@.cfg 5002 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5002 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix42:
-	cd _test; ./runat.sh $@.cfg 5003 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5003 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix43:
-	cd _test; ./runat.sh $@.cfg 5004 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5004 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix44:
-	cd _test; ./runat.sh $@.cfg 5005 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5005 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix50:
-	cd _test; ./runat.sh $@.cfg 5006 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5006 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix50sp1:
-	cd _test; ./runat.sh $@.cfg 5007 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5007 $(STORE_TYPE) "definitions/server/$@/*.def"
 fix50sp2:
-	cd _test; ./runat.sh $@.cfg 5008 "definitions/server/$@/*.def"
+	cd _test; ./runat.sh $@.cfg 5008 $(STORE_TYPE) "definitions/server/$@/*.def"
 
 ACCEPT_SUITE=fix40 fix41 fix42 fix43 fix44 fix50 fix50sp1 fix50sp2 
 accept: $(ACCEPT_SUITE)

_test/runat.sh

@@ -2,9 +2,10 @@
 
 CFG=$1
 PORT=$2
-TESTS=$3
+STORETYPE=$3
+TESTS=$4
 
-./echo_server $CFG &
+./echo_server $CFG $STORETYPE &
 pid=$!
 
 ruby -I. Runner.rb 127.0.0.1 $PORT $TESTS

_test/test-server/main.go

@@ -7,8 +7,12 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	"path"
+	"strings"
+	"time"
 
 	"github.com/quickfixgo/quickfix"
+	"github.com/quickfixgo/quickfix/config"
 	field "github.com/quickfixgo/quickfix/gen/field"
 	tag "github.com/quickfixgo/quickfix/gen/tag"
 )
@@ -131,7 +135,21 @@ func main() {
 		return
 	}
 
-	acceptor, err := quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	storeType := os.Args[2]
+
+	var acceptor *quickfix.Acceptor
+	switch strings.ToUpper(storeType) {
+	case "FILE":
+		fileStoreRootPath := path.Join(os.TempDir(), fmt.Sprintf("FileStoreTestSuite-%d", os.Getpid()))
+		fileStorePath := path.Join(fileStoreRootPath, fmt.Sprintf("%d", time.Now().UnixNano()))
+		appSettings.GlobalSettings().Set(config.FileStorePath, fileStorePath)
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewFileStoreFactory(appSettings), appSettings, fileLogFactory)
+	case "MEMORY":
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	default:
+		acceptor, err = quickfix.NewAcceptor(app, quickfix.NewMemoryStoreFactory(), appSettings, fileLogFactory)
+	}
+
 	if err != nil {
 		fmt.Println("Unable to create Acceptor: ", err)
 		return

config/configuration.go

@@ -35,6 +35,7 @@ const (
 	EndTime                      string = "EndTime"
 	StartDay                     string = "StartDay"
 	EndDay                       string = "EndDay"
+	Weekdays                     string = "Weekdays"
 	TimeZone                     string = "TimeZone"
 	DataDictionary               string = "DataDictionary"
 	TransportDataDictionary      string = "TransportDataDictionary"

config/doc.go

@@ -84,16 +84,22 @@ Time of day that this FIX session becomes deactivated. Valid Values:
 
 # StartDay
 
-For week long sessions, the starting day of week for the session. Use in combination with StartTime. Valid Values:
+For week long sessions, the starting day of week for the session. Use in combination with StartTime. Incompatible with Weekdays. Valid Values:
 
 	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
 
 # EndDay
 
-For week long sessions, the ending day of week for the session. Use in combination with EndTime. Valid Values:
+For week long sessions, the ending day of week for the session. Use in combination with EndTime. Incompatible with Weekdays. Valid Values:
 
 	Full day of week in English, or 3 letter abbreviation (i.e. Monday and Mon are valid)
 
+# Weekdays
+
+For daily sessions that are only active on specific days of the week. Use in combination with StartTime and EndTime. Incompatible with StartDay and EndDay. Valid Values:
+
+	Comma delimited list of days of the week in English, or 3 letter abbreviation (e.g. "Monday,Tuesday,Wednesday" or "Mon,Tue,Wed" would both be valid values).
+
 # EnableLastMsgSeqNumProcessed
 
 Add the last message sequence number processed in the header (optional tag 369).  Valid Values:

filestore.go

@@ -76,7 +76,10 @@ func (f fileStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, er
 
 	dirname, err := sessionSettings.Setting(config.FileStorePath)
 	if err != nil {
-		return nil, err
+		dirname, err = globalSettings.Setting(config.FileStorePath)
+		if err != nil {
+			return nil, err
+		}
 	}
 	var fsync bool
 	if sessionSettings.HasSetting(config.FileStoreSync) {

internal/time_range.go

@@ -36,42 +36,67 @@ func ParseTimeOfDay(str string) (TimeOfDay, error) {
 // TimeRange represents a time band in a given time zone.
 type TimeRange struct {
 	startTime, endTime TimeOfDay
+	weekdays           []time.Weekday
 	startDay, endDay   *time.Weekday
 	loc                *time.Location
 }
 
 // NewUTCTimeRange returns a time range in UTC.
-func NewUTCTimeRange(start, end TimeOfDay) *TimeRange {
-	return NewTimeRangeInLocation(start, end, time.UTC)
+func NewUTCTimeRange(start, end TimeOfDay, weekdays []time.Weekday) (*TimeRange, error) {
+	return NewTimeRangeInLocation(start, end, weekdays, time.UTC)
 }
 
 // NewTimeRangeInLocation returns a time range in a given location.
-func NewTimeRangeInLocation(start, end TimeOfDay, loc *time.Location) *TimeRange {
+func NewTimeRangeInLocation(start, end TimeOfDay, weekdays []time.Weekday, loc *time.Location) (*TimeRange, error) {
+
 	if loc == nil {
-		panic("time: missing Location in call to NewTimeRangeInLocation")
+		return nil, errors.New("time: missing Location in call to NewTimeRangeInLocation")
 	}
 
-	return &TimeRange{startTime: start, endTime: end, loc: loc}
+	return &TimeRange{
+		startTime: start,
+		endTime:   end,
+		weekdays:  weekdays,
+		loc:       loc,
+	}, nil
 }
 
 // NewUTCWeekRange returns a weekly TimeRange.
-func NewUTCWeekRange(startTime, endTime TimeOfDay, startDay, endDay time.Weekday) *TimeRange {
+func NewUTCWeekRange(startTime, endTime TimeOfDay, startDay, endDay time.Weekday) (*TimeRange, error) {
 	return NewWeekRangeInLocation(startTime, endTime, startDay, endDay, time.UTC)
 }
 
 // NewWeekRangeInLocation returns a time range in a given location.
-func NewWeekRangeInLocation(startTime, endTime TimeOfDay, startDay, endDay time.Weekday, loc *time.Location) *TimeRange {
-	r := NewTimeRangeInLocation(startTime, endTime, loc)
+func NewWeekRangeInLocation(startTime, endTime TimeOfDay, startDay, endDay time.Weekday, loc *time.Location) (*TimeRange, error) {
+	r, err := NewTimeRangeInLocation(startTime, endTime, []time.Weekday{}, loc)
+	if err != nil {
+		return nil, err
+	}
 	r.startDay = &startDay
 	r.endDay = &endDay
 
-	return r
+	return r, nil
 }
 
 func (r *TimeRange) isInTimeRange(t time.Time) bool {
 	t = t.In(r.loc)
 	ts := NewTimeOfDay(t.Clock()).d
 
+	if len(r.weekdays) > 0 {
+		found := false
+
+		for _, weekday := range r.weekdays {
+			if t.Weekday() == weekday {
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			return false
+		}
+	}
+
 	if r.startTime.d < r.endTime.d {
 		return r.startTime.d <= ts && ts <= r.endTime.d
 	}