Skip to content

bugfix: Fixed issue with global shared RegExps for queue #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2023
Merged

bugfix: Fixed issue with global shared RegExps for queue #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions diskqueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ const (
maxMetaDataFileSize = 56
)

var badFileNameRegexp, fileNameRegexp *regexp.Regexp

type AppLogFunc func(lvl LogLevel, f string, args ...interface{})

func (l LogLevel) String() string {
Expand Down Expand Up @@ -115,6 +113,8 @@ type diskQueue struct {

// disk limit implementation flag
enableDiskLimitation bool

badFileNameRegexp, fileNameRegexp *regexp.Regexp
}

// New instantiates an instance of diskQueue, retrieving metadata
Expand Down Expand Up @@ -186,8 +186,8 @@ func (d *diskQueue) start() error {
d.logf(ERROR, "DISKQUEUE(%s) failed to retrieveMetaData - %s", d.name, err)
}

fileNameRegexp = regexp.MustCompile(`^` + d.name + `.diskqueue.\d+.dat$`)
badFileNameRegexp = regexp.MustCompile(`^` + d.name + `.diskqueue.\d+.dat.bad$`)
d.fileNameRegexp = regexp.MustCompile(`^` + d.name + `.diskqueue.\d+.dat$`)
d.badFileNameRegexp = regexp.MustCompile(`^` + d.name + `.diskqueue.\d+.dat.bad$`)

d.updateTotalDiskSpaceUsed()

Expand Down Expand Up @@ -538,7 +538,7 @@ func (d *diskQueue) getAllBadFileInfo() ([]os.FileInfo, error) {

getAllBadFileInfo := func(fileInfo os.FileInfo) error {
// only accept "bad" files created by this DiskQueue object
if badFileNameRegexp.MatchString(fileInfo.Name()) {
if d.badFileNameRegexp.MatchString(fileInfo.Name()) {
badFileInfos = append(badFileInfos, fileInfo)
}

Expand All @@ -556,7 +556,7 @@ func (d *diskQueue) updateTotalDiskSpaceUsed() {

updateTotalDiskSpaceUsed := func(fileInfo os.FileInfo) error {
// only accept files created by this DiskQueue object
if fileNameRegexp.MatchString(fileInfo.Name()) || badFileNameRegexp.MatchString(fileInfo.Name()) {
if d.fileNameRegexp.MatchString(fileInfo.Name()) || d.badFileNameRegexp.MatchString(fileInfo.Name()) {
d.totalDiskSpaceUsed += fileInfo.Size()
}

Expand Down