From 0900f328b74f5d5a51824f58484a4ff839dd1fbb Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Thu, 15 Nov 2007 23:09:02 -0700 Subject: [PATCH] node.py: try rlimit fix again --- src/allmydata/node.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/allmydata/node.py b/src/allmydata/node.py index e9dc19f4..6b07c0b9 100644 --- a/src/allmydata/node.py +++ b/src/allmydata/node.py @@ -95,12 +95,12 @@ class Node(service.MultiService): # well leave it alone. try: - current = resource.getrlimit(resource.RLIMIT_NOFILE)[0] + current = resource.getrlimit(resource.RLIMIT_NOFILE) except AttributeError: # we're probably missing RLIMIT_NOFILE, maybe this is windows return - if current >= 1024: + if current[0] >= 1024: # good enough, leave it alone return @@ -114,8 +114,8 @@ class Node(service.MultiService): # it doesn't work on linux (on which both the hard and # soft limits are set to 1024 by default). resource.setrlimit(resource.RLIMIT_NOFILE, (-1,-1)) - new = resource.getrlimit(resource.RLIMIT_NOFILE)[0] - if new == current: + new[0] = resource.getrlimit(resource.RLIMIT_NOFILE) + if new[0] == current[0]: # probably cygwin, which ignores -1. Use a real value. resource.setrlimit(resource.RLIMIT_NOFILE, (3200,-1)) -- 2.45.2