feat: use options on retry (unix) (#78)

ldez · web-flow · commit b659e1e00ac3 · 2024-06-30T19:43:00.000+02:00
diff --git a/flock.go b/flock.go
@@ -143,10 +143,12 @@ func tryCtx(ctx context.Context, fn func() (bool, error), retryDelay time.Durati
 	if ctx.Err() != nil {
 		return false, ctx.Err()
 	}
+
 	for {
 		if ok, err := fn(); ok || err != nil {
 			return ok, err
 		}
+
 		select {
 		case <-ctx.Done():
 			return false, ctx.Err()
@@ -175,6 +177,7 @@ func (f *Flock) ensureFhState() {
 		return
 	}
 
-	f.fh.Close()
+	_ = f.fh.Close()
+
 	f.fh = nil
 }
diff --git a/flock_unix.go b/flock_unix.go
@@ -72,6 +72,7 @@ func (f *Flock) lock(locked *bool, flag int) error {
 	}
 
 	*locked = true
+
 	return nil
 }
 
@@ -100,7 +101,7 @@ func (f *Flock) Unlock() error {
 		return err
 	}
 
-	f.fh.Close()
+	_ = f.fh.Close()
 
 	f.l = false
 	f.r = false
@@ -152,10 +153,10 @@ func (f *Flock) try(locked *bool, flag int) (bool, error) {
 retry:
 	err := syscall.Flock(int(f.fh.Fd()), flag|syscall.LOCK_NB)
 
-	switch err {
-	case syscall.EWOULDBLOCK:
+	switch {
+	case errors.Is(err, syscall.EWOULDBLOCK):
 		return false, nil
-	case nil:
+	case err == nil:
 		*locked = true
 		return true, nil
 	}
@@ -183,12 +184,12 @@ func (f *Flock) reopenFDOnError(err error) (bool, error) {
 	}
 	if st, err := f.fh.Stat(); err == nil {
 		// if the file is able to be read and written
-		if st.Mode()&0o600 == 0o600 {
-			f.fh.Close()
+		if st.Mode()&f.perm == f.perm {
+			_ = f.fh.Close()
 			f.fh = nil
 
-			// reopen in read-write mode and set the filehandle
-			fh, err := os.OpenFile(f.path, os.O_CREATE|os.O_RDWR, os.FileMode(0o600))
+			// reopen in read-write mode and set the file handle
+			fh, err := os.OpenFile(f.path, f.flag, f.perm)
 			if err != nil {
 				return false, err
 			}
diff --git a/flock_unix_variants.go b/flock_unix_variants.go
@@ -257,13 +257,14 @@ func (f *Flock) try(locked *bool, flag lockType) (bool, error) {
 		defer f.ensureFhState()
 	}
 
-	haslock, err := f.doLock(tryLock, flag, false)
+	hasLock, err := f.doLock(tryLock, flag, false)
 	if err != nil {
 		return false, err
 	}
 
-	*locked = haslock
-	return haslock, nil
+	*locked = hasLock
+
+	return hasLock, nil
 }
 
 // setlkw calls FcntlFlock with cmd for the entire file indicated by fd.
diff --git a/flock_windows.go b/flock_windows.go
@@ -81,7 +81,7 @@ func (f *Flock) Unlock() error {
 		return errNo
 	}
 
-	f.fh.Close()
+	_ = f.fh.Close()
 
 	f.l = false
 	f.r = false

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,12 @@ func tryCtx(ctx context.Context, fn func() (bool, error), retryDelay time.Durati`
`143`	`143`	`if ctx.Err() != nil {`
`144`	`144`	`return false, ctx.Err()`
`145`	`145`	`}`
	`146`	`+`
`146`	`147`	`for {`
`147`	`148`	`if ok, err := fn(); ok \|\| err != nil {`
`148`	`149`	`return ok, err`
`149`	`150`	`}`
	`151`	`+`
`150`	`152`	`select {`
`151`	`153`	`case <-ctx.Done():`
`152`	`154`	`return false, ctx.Err()`
`@@ -175,6 +177,7 @@ func (f *Flock) ensureFhState() {`
`175`	`177`	`return`
`176`	`178`	`}`
`177`	`179`
`178`		`- f.fh.Close()`
	`180`	`+ _ = f.fh.Close()`
	`181`	`+`
`179`	`182`	`f.fh = nil`
`180`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -257,13 +257,14 @@ func (f Flock) try(locked bool, flag lockType) (bool, error) {`
`257`	`257`	`defer f.ensureFhState()`
`258`	`258`	`}`
`259`	`259`
`260`		`- haslock, err := f.doLock(tryLock, flag, false)`
	`260`	`+ hasLock, err := f.doLock(tryLock, flag, false)`
`261`	`261`	`if err != nil {`
`262`	`262`	`return false, err`
`263`	`263`	`}`
`264`	`264`
`265`		`- *locked = haslock`
`266`		`- return haslock, nil`
	`265`	`+ *locked = hasLock`
	`266`	`+`
	`267`	`+ return hasLock, nil`
`267`	`268`	`}`
`268`	`269`
`269`	`270`	`// setlkw calls FcntlFlock with cmd for the entire file indicated by fd.`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (f *Flock) Unlock() error {`
`81`	`81`	`return errNo`
`82`	`82`	`}`
`83`	`83`
`84`		`- f.fh.Close()`
	`84`	`+ _ = f.fh.Close()`
`85`	`85`
`86`	`86`	`f.l = false`
`87`	`87`	`f.r = false`