diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-03 01:12:37 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-03 01:12:37 +1100 |
| commit | ea708efedd7f207ce3fc05835612391816f8d4a1 (patch) | |
| tree | 42bdd87aaffc48f6d92c7e6b4d748e2c8cb821fe /synapse/events/__init__.py | |
| parent | changelog (diff) | |
| parent | Fix typing being reset causing infinite syncs (#4127) (diff) | |
| download | synapse-matthew/heroes-for-avatars.tar.xz | |
Merge branch 'develop' into matthew/heroes-for-avatars github/matthew/heroes-for-avatars matthew/heroes-for-avatars
Diffstat (limited to 'synapse/events/__init__.py')
| -rw-r--r-- | synapse/events/__init__.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index b782af6308..12f1eb0a3e 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -13,15 +13,22 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os +from distutils.util import strtobool + import six from synapse.util.caches import intern_dict from synapse.util.frozenutils import freeze # Whether we should use frozen_dict in FrozenEvent. Using frozen_dicts prevents -# bugs where we accidentally share e.g. signature dicts. However, converting -# a dict to frozen_dicts is expensive. -USE_FROZEN_DICTS = True +# bugs where we accidentally share e.g. signature dicts. However, converting a +# dict to frozen_dicts is expensive. +# +# NOTE: This is overridden by the configuration by the Synapse worker apps, but +# for the sake of tests, it is set here while it cannot be configured on the +# homeserver object itself. +USE_FROZEN_DICTS = strtobool(os.environ.get("SYNAPSE_USE_FROZEN_DICTS", "0")) class _EventInternalMetadata(object): |