kallithea Changeset - 7b092b919f4f

Changeset - 7b092b919f4f

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Marcin Kuzminski - 13 years ago 2012-07-13 21:17:38
marcin@python-works.com

Switch to waitress wsgi server by default in rhodecode.
- waitress is fast, handles chunked encoding correctly (needed for git)
- waitress works on linux and windows
- it's now default because it can handle git properly out of the box.

6 files changed with 27 insertions and 24 deletions:

development.ini

production.ini

rhodecode/config/deployment.ini_tmpl

rhodecode/model/pull_request.py

setup.py

test.ini

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -21,42 +21,43 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
+#threadpool_workers = 5
 ##max request before thread respawn
 threadpool_max_requests = 10
+#threadpool_max_requests = 10
 ##option to use threads of process
 use_threadpool = true
+#use_threadpool = true
 use = egg:Paste#http
 #use = egg:Paste#http
 use = egg:waitress#main
 host = 0.0.0.0
 port = 5000
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, pt_BR, zh_CN, zh_TW
+# en, fr, ja, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-develop
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
 use_gravatar = true
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8

production.ini

➞

Show inline comments

@@ @@ -21,42 +21,43 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
+#threadpool_workers = 5
 ##max request before thread respawn
 threadpool_max_requests = 10
+#threadpool_max_requests = 10
 ##option to use threads of process
 use_threadpool = true
+#use_threadpool = true
 use = egg:Paste#http
 #use = egg:Paste#http
 use = egg:waitress#main
 host = 127.0.0.1
 port = 8001
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, pt_BR, zh_CN, zh_TW
+# en, fr, ja, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = rc-production
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -21,33 +21,34 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
+#threadpool_workers = 5
 ##max request before thread respawn
 threadpool_max_requests = 10
+#threadpool_max_requests = 10
 ##option to use threads of process
 use_threadpool = true
+#use_threadpool = true
 use = egg:Paste#http
 #use = egg:Paste#http
 use = egg:waitress#main
 host = 127.0.0.1
 port = 5000
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 # Optional Languages
 # en, fr, ja, pt_BR, zh_CN, zh_TW
 lang = en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index

rhodecode/model/pull_request.py

➞

Show inline comments

@@ @@ -16,37 +16,35 @@ @@
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 import binascii
 from pylons.i18n.translation import _
 from rhodecode.model.meta import Session
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import PullRequest, PullRequestReviewers, Notification,\
     ChangesetStatus
 from rhodecode.model.db import PullRequest, PullRequestReviewers, Notification
 from rhodecode.model.notification import NotificationModel
 from rhodecode.lib.utils2 import safe_unicode
 from rhodecode.lib.vcs.utils.hgcompat import discovery
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import ChangesetCommentsModel
 from rhodecode.model.meta import Session
 log = logging.getLogger(__name__)
 class PullRequestModel(BaseModel):
     cls = PullRequest
     def get_all(self, repo):
         repo = self._get_repo(repo)
         return PullRequest.query().filter(PullRequest.other_repo == repo).all()

setup.py

➞

Show inline comments

@@ @@ -24,41 +24,42 @@ _meta.close() @@
 callback = lambda V: ('.'.join(map(str, V[:3])) + '.'.join(V[3:]))
 __version__ = _get_meta_var('VERSION', _metadata, callback)
 __license__ = _get_meta_var('__license__', _metadata)
 __author__ = _get_meta_var('__author__', _metadata)
 __url__ = _get_meta_var('__url__', _metadata)
 # defines current platform
 __platform__ = platform.system()
 is_windows = __platform__ in _get_meta_var('PLATFORM_WIN', _metadata)
 requirements = [
     "waitress==0.8.1",
     "Pylons==1.0.0",
     "Beaker==1.6.3",
     "WebHelpers==1.3",
     "formencode==1.2.4",
     "SQLAlchemy==0.7.8",
     "Mako==0.7.0",
     "pygments>=1.4",
     "whoosh>=2.4.0,<2.5",
     "celery>=2.2.5,<2.3",
     "babel",
     "python-dateutil>=1.5.0,<2.0.0",
     "dulwich>=0.8.5,<0.9.0",
     "webob==1.0.8",
     "markdown==2.1.1",
     "docutils==0.8.1",
     "simplejson==2.5.2",
     "mock"
+    "mock",
+]
 if sys.version_info < (2, 6):
     requirements.append("pysqlite")
 if sys.version_info <= (2, 6):
     requirements.append("unittest2")
 if is_windows:
     requirements.append("mercurial>=2.2.3,<2.3")
 else:
     requirements.append("py-bcrypt")

test.ini

➞

Show inline comments

@@ @@ -21,33 +21,34 @@ pdebug = false @@
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
+#threadpool_workers = 5
 ##max request before thread respawn
 threadpool_max_requests = 2
+#threadpool_max_requests = 2
 ##option to use threads of process
 use_threadpool = true
+#use_threadpool = true
 use = egg:Paste#http
 #use = egg:Paste#http
 use = egg:waitress#main
 host = 127.0.0.1
 port = 5000
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 lang=en
 cache_dir = /tmp/data
 index_dir = /tmp/index
 app_instance_uuid = develop-test
 cut_off_limit = 256000

0 comments (0 inline, 0 general)