Merge pull request #130 from V-E-O/patch-1

fix import error of resource on windows
8 years ago · 0b94af0b7d
1 changed files with 5 additions and 2 deletions
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@ -41,8 +41,11 @@ def main():

    daemon.daemon_exec(config)

-    import resource
-    logging.info('current process RLIMIT_NOFILE resource: soft %d hard %d'  % resource.getrlimit(resource.RLIMIT_NOFILE))
+    try:
+        import resource
+        logging.info('current process RLIMIT_NOFILE resource: soft %d hard %d'  % resource.getrlimit(resource.RLIMIT_NOFILE))
+    except ImportError:
+        pass

    if config['port_password']:
        pass