Flask-Hypertable v0.2.1 Added HYPERTABLE_TIMEOUT_MSECS option (defaults

coderfi · coderfi · commit b8fba109e616 · 2014-03-30T14:57:09.000-07:00
to 5000 msecs)
diff --git a/CHANGES b/CHANGES
@@ -13,6 +13,15 @@ Here you can find the recent changes to Flask Hypertable.
 
         Updated CHANGES.
 
+.. changelog::
+    :version: 0.2.1
+    :released: 2014-03-30
+
+    .. change::
+        :tags: project
+
+        Added HYPERTABLE_TIMEOUT_MSECS option (defaults to 5000 msecs)
+
 .. changelog::
     :version: 0.2.0
     :released: 2014-03-26
diff --git a/docs/usage.rst b/docs/usage.rst
@@ -23,6 +23,7 @@ Your configuration should be declared within your Flask config::
 
     HYPERTABLE_HOST = "localhost"
     HYPERTABLE_PORT = 38080
+    HYPERTABLE_TIMEOUT_MSECS = 5000
 
     ################
     #if using FlaskPooledHypertable
diff --git a/flask_hypertable/__init__.py b/flask_hypertable/__init__.py
@@ -17,7 +17,7 @@
 __author__ = 'Fairiz Azizi'
 __description__ = 'A Flask extension for Hypertable over Thrift.'
 __email__ = 'coderfi@gmail.com'
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2014 Fairiz Azizi'
 
diff --git a/flask_hypertable/flask_hypertable.py b/flask_hypertable/flask_hypertable.py
@@ -33,6 +33,7 @@ class FlaskHypertable(object):
 
     HYPERTABLE_HOST: 'localhost'
     HYPERTABLE_PORT: 38080
+    HYPERTABLE_TIMEOUT_MSECS: 5000
 
     Under the hood, this extension uses the ``ManagedThriftClient``.
     """
@@ -53,6 +54,11 @@ def init_app(self, app):
         """
         app.config.setdefault('HYPERTABLE_HOST', 'localhost')
         app.config.setdefault('HYPERTABLE_PORT', 38080)
+        app.config.setdefault("HYPERTABLE_TIMEOUT_MSECS", 5000)
+
+        self.host = self.app.config['HYPERTABLE_HOST']
+        self.port = self.app.config['HYPERTABLE_PORT']
+        self.timeout_msecs = self.app.config['HYPERTABLE_TIMEOUT_MSECS']
 
         # Use the newstyle teardown_appcontext if it's available,
         # otherwise fall back to the request context
@@ -72,8 +78,9 @@ def connect(self):
         """ Creates a new Thrift client
         :return: ``ManagedThriftClient``
         """
-        return ManagedThriftClient(current_app.config['HYPERTABLE_HOST'],
-                                   current_app.config['HYPERTABLE_PORT'])
+        return ManagedThriftClient(self.host,
+                                   self.port,
+                                   timeout_ms=self.timeout_msecs)
 
     def teardown(self, exception):
         """ Puts the connection object back into the pool. """
