Deregister event queues when done in our Nagios scripts.

(imported from commit a1f73403163323e1dd9eda2f5269e94c60abdd1a)
This commit is contained in:
Tim Abbott 2013-11-19 17:51:06 -05:00
parent 3da6c41345
commit 9b8555ba12
2 changed files with 5 additions and 0 deletions

View file

@ -350,4 +350,5 @@ if h_missing_z:
logger.error("zulip: This suggests we have a zephyr=>zulip mirroring problem.") logger.error("zulip: This suggests we have a zephyr=>zulip mirroring problem.")
logger.error("zulip: aka the global class mirroring script has issues.") logger.error("zulip: aka the global class mirroring script has issues.")
zulip_client.deregister(queue_id)
print_status_and_exit(1) print_status_and_exit(1)

View file

@ -288,6 +288,9 @@ def _mk_subs(streams, **kwargs):
def _mk_rm_subs(streams): def _mk_rm_subs(streams):
return {'delete': streams} return {'delete': streams}
def _mk_deregister(queue_id):
return {'queue_id': queue_id}
def _mk_events(event_types=None): def _mk_events(event_types=None):
if event_types is None: if event_types is None:
return dict() return dict()
@ -322,6 +325,7 @@ Client._register('update_message', method='PATCH', url='messages', make_request=
Client._register('get_messages', method='GET', url='messages/latest', longpolling=True) Client._register('get_messages', method='GET', url='messages/latest', longpolling=True)
Client._register('get_events', url='events', method='GET', longpolling=True, make_request=(lambda **kwargs: kwargs)) Client._register('get_events', url='events', method='GET', longpolling=True, make_request=(lambda **kwargs: kwargs))
Client._register('register', make_request=_mk_events) Client._register('register', make_request=_mk_events)
Client._register('deregister', url="events", method="DELETE", make_request=_mk_deregister)
Client._register('get_profile', method='GET', url='users/me') Client._register('get_profile', method='GET', url='users/me')
Client._register('get_streams', method='GET', url='streams', make_request=_kwargs_to_dict) Client._register('get_streams', method='GET', url='streams', make_request=_kwargs_to_dict)
Client._register('get_members', method='GET', url='users') Client._register('get_members', method='GET', url='users')