From 8f19fe278c01b6870fb14649161b544dff1e2603 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Sat, 17 May 2014 13:54:28 +0800
Subject: [PATCH] fix workers

---
 CHANGES               | 3 +++
 README.md             | 8 +++++---
 shadowsocks/server.py | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index a1d6fca..b7f2762 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1.4.4 2014-05-17
+- Support multiple workers
+
 1.4.3 2014-05-13
 - Fix Windows
 
diff --git a/README.md b/README.md
index 857de7c..7718dd7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 shadowsocks
 ===========
 
-Current version: 1.4.3 [![Build Status][1]][0]
+Current version: 1.4.4 [![Build Status][1]][0]
 
 shadowsocks is a lightweight tunnel proxy which can help you get through firewalls.
 
@@ -55,7 +55,8 @@ Example:
         "password":"mypassword",
         "timeout":300,
         "method":"aes-256-cfb",
-        "fast_open": false
+        "fast_open": false,
+        "workers": 1
     }
 
 Explanation of the fields:
@@ -70,6 +71,7 @@ Explanation of the fields:
 | timeout       | in seconds                                      |
 | method        | encryption method, "aes-256-cfb" is recommended |
 | fast_open     | use [TCP_FASTOPEN][2], true / false             |
+| workers       | number of workers, available on Unix/Linux      |
 
 Run `ssserver -c /etc/shadowsocks.json` on your server. To run it in the background, [use supervisor][8].
 
@@ -91,7 +93,7 @@ Command line args
 You can use args to override settings from `config.json`.
 
     sslocal -s server_name -p server_port -l local_port -k password -m bf-cfb
-    ssserver -p server_port -k password -m bf-cfb
+    ssserver -p server_port -k password -m bf-cfb --workers 2
     ssserver -c /etc/shadowsocks/config.json
 
 Salsa20
diff --git a/shadowsocks/server.py b/shadowsocks/server.py
index d383826..63363d8 100755
--- a/shadowsocks/server.py
+++ b/shadowsocks/server.py
@@ -284,6 +284,7 @@ def main():
                     os.waitpid(child, 0)
         else:
             logging.warn('worker is only available on Unix/Linux')
+            run_server()
     else:
         run_server()