rhodecode-enterprise-ce Files · pkgs/patch-kombu-msgpack.diff

error-middleware: read title from cached rhodecode object....

error-middleware: read title from cached rhodecode object. - reading from settings inside error handler can cause error hiding when error_handler was caused by database error. Db transaction is set as rollback, and re-trying to read the settings can hide the real error.

marcink - - Load All Authors

File last commit:

r1:854a839a default


                r1496:cf3f95ff

default

Download file

             patch-kombu-msgpack.diff
        
                    12 lines
            
             | 629 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patch-kombu-msgpack.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup kombu-1.5.1-orig/kombu/serialization.py kombu-1.5.1/kombu/serialization.py

      --- kombu-1.5.1-orig/kombu/serialization.py	2016-03-09 15:11:34.000000000 +0100

      +++ kombu-1.5.1/kombu/serialization.py	2016-03-09 15:19:20.000000000 +0100

      @@ -318,7 +318,7 @@ def register_msgpack():

           """See http://msgpack.sourceforge.net/"""

           try:

               import msgpack

      -        registry.register('msgpack', msgpack.packs, msgpack.unpacks,

      +        registry.register('msgpack', msgpack.packb, msgpack.unpackb,

                       content_type='application/x-msgpack',

                       content_encoding='binary')

           except ImportError:

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff -rup kombu-1.5.1-orig/kombu/serialization.py kombu-1.5.1/kombu/serialization.py
				--- kombu-1.5.1-orig/kombu/serialization.py 2016-03-09 15:11:34.000000000 +0100
				+++ kombu-1.5.1/kombu/serialization.py 2016-03-09 15:19:20.000000000 +0100
				@@ -318,7 +318,7 @@ def register_msgpack():
				"""See http://msgpack.sourceforge.net/"""
				try:
				import msgpack
				- registry.register('msgpack', msgpack.packs, msgpack.unpacks,
				+ registry.register('msgpack', msgpack.packb, msgpack.unpackb,
				content_type='application/x-msgpack',
				content_encoding='binary')
				except ImportError: