Fix error if one of Max or Cur limit is upper than new value

nabbar · Jun 17, 2020 · ca494d2 · ca494d2
1 parent d6138a7
commit ca494d2
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/njs-ioutils/fileDescriptor.go b/njs-ioutils/fileDescriptor.go
@@ -49,12 +49,24 @@ func SystemFileDescriptor(newValue int) (current int, max int, err error) {
 		return int(rLimit.Cur), int(rLimit.Max), nil
 	}
 
-	rLimit.Max = uint64(newValue)
-	rLimit.Cur = uint64(newValue)
+	var chg = false
 
-	if err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
-		return
+	if newValue > int(rLimit.Max) {
+		chg = true
+		rLimit.Max = uint64(newValue)
+	}
+	if newValue > int(rLimit.Cur) {
+		chg = true
+		rLimit.Cur = uint64(newValue)
+	}
+
+	if chg {
+		if err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
+			return
+		}
+
+		return SystemFileDescriptor(0)
 	}
 
-	return SystemFileDescriptor(0)
+	return int(rLimit.Cur), int(rLimit.Max), nil
 }