xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

zephyr: Free received notices with ZFreeNotice.

Browse source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2023-01-24 00:52:32 -08:00
parent c94da617ed
commit 7831d979c9
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zulip/integrations/zephyr/check-mirroring
View file

@ -228,6 +228,7 @@ def receive_zephyrs() -> None:
logging.exception("Exception receiving zephyrs:") logging.exception("Exception receiving zephyrs:")
break break
if notice.z_opcode != b"": if notice.z_opcode != b"":
zephyr_ctypes.ZFreeNotice(byref(notice))
continue continue
notices.append(notice) notices.append(notice)
@ -335,6 +336,9 @@ z_contents = [
(h_key_counts, h_missing_z, h_missing_h, h_duplicates, h_success) = process_keys(h_contents) (h_key_counts, h_missing_z, h_missing_h, h_duplicates, h_success) = process_keys(h_contents)
(z_key_counts, z_missing_z, z_missing_h, z_duplicates, z_success) = process_keys(z_contents) (z_key_counts, z_missing_z, z_missing_h, z_duplicates, z_success) = process_keys(z_contents)
for notice in notices:
zephyr_ctypes.ZFreeNotice(byref(notice))
if z_success and h_success: if z_success and h_success:
logger.info("Success!") logger.info("Success!")
print_status_and_exit(0) print_status_and_exit(0)

1
zulip/integrations/zephyr/zephyr_ctypes.py
View file

@ -167,6 +167,7 @@ ZGetSubscriptions = CFUNCTYPE(Code_t, POINTER(ZSubscription_t), POINTER(c_int))(
) )
ZOpenPort = CFUNCTYPE(Code_t, POINTER(c_ushort))(("ZOpenPort", libzephyr)) ZOpenPort = CFUNCTYPE(Code_t, POINTER(c_ushort))(("ZOpenPort", libzephyr))
ZFlushSubscriptions = CFUNCTYPE(Code_t)(("ZFlushSubscriptions", libzephyr)) ZFlushSubscriptions = CFUNCTYPE(Code_t)(("ZFlushSubscriptions", libzephyr))
ZFreeNotice = CFUNCTYPE(Code_t, POINTER(ZNotice_t))(("ZFreeNotice", libzephyr))
ZSubscribeTo = CFUNCTYPE(Code_t, POINTER(ZSubscription_t), c_int, c_uint)( ZSubscribeTo = CFUNCTYPE(Code_t, POINTER(ZSubscription_t), c_int, c_uint)(
("ZSubscribeTo", libzephyr) ("ZSubscribeTo", libzephyr)
) )

4
zulip/integrations/zephyr/zephyr_mirror_backend.py
View file

@ -321,13 +321,15 @@ def process_loop(zulip_queue: "Queue[ZephyrDict]", log: Optional[IO[str]]) -> No
notice = zephyr_ctypes.ZNotice_t() notice = zephyr_ctypes.ZNotice_t()
sender = zephyr_ctypes.sockaddr_in() sender = zephyr_ctypes.sockaddr_in()
zephyr_ctypes.check(zephyr_ctypes.ZReceiveNotice(byref(notice), byref(sender))) zephyr_ctypes.check(zephyr_ctypes.ZReceiveNotice(byref(notice), byref(sender)))
recieve_backoff.succeed()
try: try:
recieve_backoff.succeed()
process_notice(notice, zulip_queue, log) process_notice(notice, zulip_queue, log)
process_backoff.succeed() process_backoff.succeed()
except zephyr_ctypes.ZephyrError: except zephyr_ctypes.ZephyrError:
logger.exception("Error relaying zephyr:") logger.exception("Error relaying zephyr:")
process_backoff.fail() process_backoff.fail()
finally:
zephyr_ctypes.ZFreeNotice(byref(notice))
except zephyr_ctypes.ZephyrError: except zephyr_ctypes.ZephyrError:
logger.exception("Error checking for new zephyrs:") logger.exception("Error checking for new zephyrs:")
recieve_backoff.fail() recieve_backoff.fail()