ulimit: fix setting ulimit

License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>

cmd/ipfs/util/ulimit.go

@@ -59,7 +59,7 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) {
 		return false, 0, err
 	}
 
-	if maxFds <= soft {
+	if targetLimit <= soft {
 		return false, 0, nil
 	}
 

cmd/ipfs/util/ulimit_test.go

@@ -38,8 +38,10 @@ func TestManageInvalidNFds(t *testing.T) {
 		t.Fatal("Cannot set the IPFS_FD_MAX env variable")
 	}
 
-	if _, _, err := ManageFdLimit(); err == nil {
-		t.Errorf("ManageFdLimit should return an error")
+	t.Logf("setting ulimit to %d, max %d, cur %d", value, rlimit.Max, rlimit.Cur)
+
+	if changed, new, err := ManageFdLimit(); err == nil {
+		t.Errorf("ManageFdLimit should return an error: changed %t, new: %d", changed, new)
 	} else if err != nil {
 		flag := strings.Contains(err.Error(),
 			"failed to raise ulimit to IPFS_FD_MAX")