kallithea Changeset - f62a960bae39

Changeset - f62a960bae39

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-11-08 16:13:59
marcin@python-works.com

3 files changed with 22 insertions and 4 deletions:

development.ini

production.ini

rhodecode/controllers/api/__init__.py

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -131,6 +131,12 @@ beaker.cache.sql_cache_long.key_length = @@
 ## dbm, file, memcached, database, and memory.
 ## The storage uses the Container API
 ##that is also used by the cache system.
 #db session example
 #beaker.session.type = ext:database
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
 #beaker.session.table_name = db_session
 beaker.session.type = file
 beaker.session.key = rhodecode

production.ini

➞

Show inline comments

@@ @@ -130,6 +130,12 @@ beaker.cache.sql_cache_long.key_length = @@
 ## dbm, file, memcached, database, and memory.
 ## The storage uses the Container API
 ##that is also used by the cache system.
 #db session example
 #beaker.session.type = ext:database
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
 #beaker.session.table_name = db_session
 beaker.session.type = file
 beaker.session.key = rhodecode

rhodecode/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -36,7 +36,7 @@ from rhodecode.lib.compat import izip_lo @@
 from paste.response import replace_header
 from pylons.controllers import WSGIController
-from pylons.controllers.util import Response
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError, \
 HTTPBadRequest, HTTPError
@@ @@ -56,9 +56,15 @@ class JSONRPCError(BaseException): @@
 def jsonrpc_error(message, code=None):
     """Generate a Response object with a JSON-RPC error body"""
     return Response(body=json.dumps(dict(result=None,
                                          error=message)))
     """
     Generate a Response object with a JSON-RPC error body
     """
     from pylons.controllers.util import Response
     resp = Response(body=json.dumps(dict(result=None, error=message)),
                     status=code,
                     content_type='application/json')
     return resp
 class JSONRPCController(WSGIController):

0 comments (0 inline, 0 general)