Merge c5b0116 into 4d2a4ff

.gitignore

@@ -60,3 +60,6 @@ target/
 
 # Mr.developer ignores
 venv
+.venv
+
+tests/pingpong_sdk

.travis.yml

@@ -1,27 +1,28 @@
 language: python
 sudo: required
+dist: xenial
+
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27
+    - python: 3.4
+      env: TOXENV=py34
+    - python: 3.5
+      env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
+
 install:
   - pip install tox
-env:
-  - TOXENV=py27
-  - TOXENV=py34
-  - TOXENV=py35
+
 script:
   - tox
 
-cache:
-  directories:
-    - thrift-0.9.3
-
 before_install:
-  - pyenv global system 3.5
-  - ls "thrift-0.9.3" | grep "bootstrap.sh" || wget https://github.com/apache/thrift/archive/0.9.3.tar.gz -O thrift.tar.gz
-  - ls "thrift-0.9.3" | grep "bootstrap.sh" || tar xf thrift.tar.gz
-  - cd thrift-0.9.3
-  - ./bootstrap.sh
-  - ./configure --without-haskell --without-java --without-php --without-nodejs --without-cpp --without-lua --without-perl --without-ruby --without-erlang --without-rust --without-c_glib --without-go
-  - make
-  - sudo make install
+  - sudo apt-get update
+  - sudo apt-get install -y thrift-compiler
+
 after_success:
   - pip install python-coveralls
   - coveralls

README.md

@@ -1,8 +1,8 @@
 gunicorn_thrift
 ===============
 
-[![Build Status](https://travis-ci.org/eleme/gunicorn_thrift.svg?branch=master)](https://travis-ci.org/eleme/gunicorn_thrift)
-[![Coverage Status](https://coveralls.io/repos/github/eleme/gunicorn_thrift/badge.svg?branch=master)](https://coveralls.io/github/eleme/gunicorn_thrift?branch=master)
+[![Build Status](https://travis-ci.org/Thriftpy/gunicorn_thrift.svg?branch=master)](https://travis-ci.org/Thriftpy/gunicorn_thrift)
+[![Coverage Status](https://coveralls.io/repos/github/Thriftpy/gunicorn_thrift/badge.svg?branch=master)](https://coveralls.io/github/Thriftpy/gunicorn_thrift?branch=master)
 
 Thrift app and worker for gunicorn! Hence, a multi-process python thrift server!
 
@@ -96,6 +96,7 @@ There are 4 types of workers available.
 * `thrift_gevent`: gevent worker.
 * `thriftpy_sync`: sync worker, adapted for [`thriftpy2`](https://github.com/thriftpy/thriftpy2)
 * `thriftpy_gevent`: gevent worker, adapted for [`thriftpy2`](https://github.com/thriftpy/thriftpy2)
+* `thriftpy_thread`: thread worker, adapted for [`thriftpy2`](https://github.com/thriftpy/thriftpy2)
 
 note: If you want to use `thriftpy_sync` or `thriftpy_gevent`, make sure the following:
 
@@ -107,6 +108,13 @@ note: If you want to use `thriftpy_sync` or `thriftpy_gevent`, make sure the fol
     1. `thriftpy2.transport:TCyBufferedTransportFactory` or
     1. `thriftpy2.transport:TBufferedTransportFactory`
 
+### Threads
+
+How many threads per worker. Only effective when using `thriftpy_thread` worker.
+
+Parameter: `--threads`
+Config file: `threads`
+Default: 10
 
 ### Transport factory
 

gunicorn_thrift/config.py

@@ -3,12 +3,13 @@
 
 from gunicorn import six
 from gunicorn.config import Setting, validate_string, validate_pos_int,\
-    WorkerClass, validate_callable, validate_bool, validate_dict
+    WorkerClass, validate_callable, validate_bool, validate_dict, WorkerThreads
 
 from .six import DEFAULT_WORKER, DEFAULT_TRANSPORT, DEFAULT_PROTOCOL
 
 
 WorkerClass.default = DEFAULT_WORKER
+WorkerThreads.default = 10
 
 
 class ThriftTransportFactoryClass(Setting):

gunicorn_thrift/six.py

@@ -15,6 +15,7 @@
         'thrift_gevent': 'gunicorn_thrift.gevent_worker.GeventThriftWorker',
         'thriftpy_sync': 'gunicorn_thrift.thriftpy_sync_worker.SyncThriftPyWorker',
         'thriftpy_gevent': 'gunicorn_thrift.thriftpy_gevent_worker.GeventThriftPyWorker',
+        'thriftpy_thread': 'gunicorn_thrift.thriftpy_thread_worker.ThriftpyThreadWorker',
         }
 else:
     DEFAULT_WORKER = "thriftpy_sync"
@@ -23,4 +24,5 @@
     AVAILABLE_WORKERS = {
         'thriftpy_sync': 'gunicorn_thrift.thriftpy_sync_worker.SyncThriftPyWorker',
         'thriftpy_gevent': 'gunicorn_thrift.thriftpy_gevent_worker.GeventThriftPyWorker',
+        'thriftpy_thread': 'gunicorn_thrift.thriftpy_thread_worker.ThriftpyThreadWorker',
         }

gunicorn_thrift/thriftpy_gevent_worker.py

@@ -23,7 +23,7 @@
                        'gevent is not installed')
 
 try:
-    import thriftpy2
+    import thriftpy2  # noqa
 except ImportError:
     raise RuntimeError('`thriftpy_gevent` worker is unavailable because '
                        'thriftpy2 is not installed')
@@ -35,10 +35,12 @@
 from thriftpy2.protocol.cybin import ProtocolError
 from thriftpy2.thrift import TDecodeException
 
-from gunicorn.errors import AppImportError
 from gunicorn.workers.ggevent import GeventWorker
 
-from .utils import ProcessorMixin
+from .utils import (
+    ProcessorMixin,
+    check_protocol_and_transport_for_thriftpy_woker,
+    )
 
 logger = logging.getLogger(__name__)
 
@@ -60,26 +62,6 @@ def __get_real_function(module, name):
 _real_get_ident = __get_real_function(thread, 'get_ident')
 
 
-def check_protocol_and_transport(app):
-    if not app.cfg.thrift_protocol_factory.startswith('thriftpy'):
-        raise AppImportError(
-            'Thriftpy worker can only use protocol from thriftpy,'
-            'specify `thrift_protocol_factory` as one of the '
-            'following:'
-            '`thriftpy2.protocol:TCyBinaryProtocolFactory`, '
-            '`thriftpy2.protocol:TBinaryProtocolFactory`'
-            )
-
-    if not app.cfg.thrift_transport_factory.startswith('thriftpy'):
-        raise AppImportError(
-            'Thriftpy worker can only use transport from thriftpy,'
-            'specify `thrift_transport_factory` as one of the '
-            'following:'
-            '`thriftpy2.transport:TCyBufferedTransportFactory`, '
-            '`thriftpy2.transport:TBufferedTransportFactory`'
-            )
-
-
 class GeventThriftPyWorker(GeventWorker, ProcessorMixin):
     def init_process(self):
         # Set up a greenlet tracing hook to monitor for event-loop blockage,
@@ -154,7 +136,7 @@ def _check_greenlet_blocking(self):
         self._greenlet_switch_counter = 0
 
     def run(self):
-        check_protocol_and_transport(self.app)
+        check_protocol_and_transport_for_thriftpy_woker(self.app.cfg)
         super(GeventThriftPyWorker, self).run()
 
     def handle(self, listener, client, addr):