Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

federation: fix LaterGauge usage #3328

Merged
merged 1 commit into from
Jun 4, 2018
Merged

federation: fix LaterGauge usage #3328

merged 1 commit into from
Jun 4, 2018

Conversation

intelfx
Copy link
Contributor

@intelfx intelfx commented Jun 3, 2018

Fixes a startup crash due to commit df9f72d.

twisted: [] Traceback (most recent call last):
twisted: []   File "/usr/lib/python2.7/runpy.py", line 174, in _run_module_as_main
twisted: []     "__main__", fname, loader, pkg_name)
twisted: []   File "/usr/lib/python2.7/runpy.py", line 72, in _run_code
twisted: []     exec code in run_globals
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 539, in <module>
twisted: []     main()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 534, in main
twisted: []     hs = setup(sys.argv[1:])
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 363, in setup
twisted: []     hs.start_listening()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 245, in start_listening
twisted: []     self._listener_http(config, listener)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 115, in _listener_http
twisted: []     name, res.get("compress", False),
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/app/homeserver.py", line 175, in _configure_named_resource
twisted: []     client_resource = ClientRestResource(self)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/rest/__init__.py", line 66, in __init__
twisted: []     self.register_servlets(self, hs)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/rest/__init__.py", line 73, in register_servlets
twisted: []     room.register_servlets(hs, client_resource)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/rest/client/v1/room.py", line 833, in register_servlets
twisted: []     RoomTypingRestServlet(hs).register(http_server)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/rest/client/v1/room.py", line 714, in __init__
twisted: []     self.presence_handler = hs.get_presence_handler()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/server.py", line 449, in _get
twisted: []     dep = builder()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/server.py", line 249, in build_presence_handler
twisted: []     return PresenceHandler(self)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/handlers/presence.py", line 105, in __init__
twisted: []     self.federation = hs.get_federation_sender()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/server.py", line 449, in _get
twisted: []     dep = builder()
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/server.py", line 366, in build_federation_sender
twisted: []     return FederationRemoteSendQueue(self)
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/federation/send_queue.py", line 84, in __init__
twisted: []     register(queue_name, getattr(self, queue_name))
twisted: []   File "/usr/lib/python2.7/site-packages/synapse/federation/send_queue.py", line 78, in register
twisted: []     "", lambda: len(queue))
twisted: [] TypeError: __init__() takes exactly 5 arguments (4 given)

@intelfx
federation/send_queue.py: fix usage of LaterGauge
7d9d75e 
Fixes a startup crash due to commit df9f72d
"replacing portions".
@matrixbot
Copy link
Member

Can one of the admins verify this patch?

1 similar comment
@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@hawkowl
Copy link
Contributor

hawkowl commented Jun 3, 2018

Guess I screwed that up! Oops!

@hawkowl
Copy link
Contributor

hawkowl commented Jun 3, 2018

matrixbot: test this please

@hawkowl hawkowl self-assigned this Jun 3, 2018
@hawkowl hawkowl merged commit 86accac into matrix-org:develop Jun 4, 2018
neilisfragile added a commit that referenced this pull request Jun 6, 2018
@neilisfragile
Merge tag 'v0.31.0'
752b7b3 
Changes in synapse v0.31.0 (2018-06-06)
======================================

Most notable change from v0.30.0 is to switch to python prometheus library to improve system
stats reporting. WARNING this changes a number of prometheus metrics in a
backwards-incompatible manner. For more details, see
`docs/metrics-howto.rst <docs/metrics-howto.rst#removal-of-deprecated-metrics--time-based-counters-becoming-histograms-in-0310>`_.

Bug Fixes:

* Fix metric documentation tables (PR #3341)
* Fix LaterGuage error handling (694968f)
* Fix replication metrics (b7e7fd2)

Changes in synapse v0.31.0-rc1 (2018-06-04)
==========================================

Features:

* Switch to the Python Prometheus library (PR #3256, #3274)
* Let users leave the server notice room after joining (PR #3287)

Changes:

* daily user type phone home stats (PR #3264)
* Use iter* methods for _filter_events_for_server (PR #3267)
* Docs on consent bits (PR #3268)
* Remove users from user directory on deactivate (PR #3277)
* Avoid sending consent notice to guest users (PR #3288)
* disable CPUMetrics if no /proc/self/stat (PR #3299)
* Add local and loopback IPv6 addresses to url_preview_ip_range_blacklist (PR #3312) Thanks to @thegcat!
* Consistently use six's iteritems and wrap lazy keys/values in list() if they're not meant to be lazy (PR #3307)
* Add private IPv6 addresses to example config for url preview blacklist (PR #3317) Thanks to @thegcat!
* Reduce stuck read-receipts: ignore depth when updating (PR #3318)
* Put python's logs into Trial when running unit tests (PR #3319)

Changes, python 3 migration:

* Replace some more comparisons with six (PR #3243) Thanks to @NotAFile!
* replace some iteritems with six (PR #3244) Thanks to @NotAFile!
* Add batch_iter to utils (PR #3245) Thanks to @NotAFile!
* use repr, not str (PR #3246) Thanks to @NotAFile!
* Misc Python3 fixes (PR #3247) Thanks to @NotAFile!
* Py3 storage/_base.py (PR #3278) Thanks to @NotAFile!
* more six iteritems (PR #3279) Thanks to @NotAFile!
* More Misc. py3 fixes (PR #3280) Thanks to @NotAFile!
* remaining isintance fixes (PR #3281) Thanks to @NotAFile!
* py3-ize state.py (PR #3283) Thanks to @NotAFile!
* extend tox testing for py3 to avoid regressions (PR #3302) Thanks to @krombel!
* use memoryview in py3 (PR #3303) Thanks to @NotAFile!

Bugs:

* Fix federation backfill bugs (PR #3261)
* federation: fix LaterGauge usage (PR #3328) Thanks to @intelfx!
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@hawkowl hawkowl

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@intelfx @matrixbot @hawkowl