pyobs-core 2.0.0.dev33__py3-none-any.whl → 2.0.0.dev35__py3-none-any.whl

pyobs/comm/comm.py

@@ -663,7 +663,27 @@ class Comm:
                 # handle it
                 ret = handler(event, from_client)
                 if asyncio.iscoroutine(ret):
-                    asyncio.create_task(ret)
+                    task = asyncio.create_task(ret)
+                    task.add_done_callback(functools.partial(self._log_handler_exception, handler=handler, event=event))
+
+    @staticmethod
+    def _log_handler_exception(task: asyncio.Task[Any], handler: Callable[..., Any], event: Event) -> None:
+        """Log an event handler's exception with context, instead of leaving it to asyncio's own
+        "Task exception was never retrieved" warning at garbage-collection time, which gives no
+        indication of which handler or event actually failed -- every event handler is dispatched
+        as a fire-and-forget task (see _send_event_to_module), so this is the only place any of
+        them get their exceptions surfaced at all.
+        """
+        if task.cancelled():
+            return
+        exc = task.exception()
+        if exc is not None:
+            log.error(
+                "Unhandled exception in event handler %s for %s.",
+                getattr(handler, "__qualname__", handler),
+                event.__class__.__name__,
+                exc_info=exc,
+            )
 
 
 __all__ = ["Comm"]

pyobs/comm/xmpp/xmppcomm.py

@@ -844,7 +844,12 @@ class XmppComm(Comm):
             Return value from method.
         """
 
-        # try multiple times
+        # try multiple times -- unlike _get_capabilities/_subscribe_with_retry this still gives up
+        # after a fixed budget instead of retrying indefinitely, since some callers run from open()
+        # and need to know a send failed rather than hang forever (see #664/#666). But the wait
+        # between attempts is jittered for the same reason as those: many modules' _safe_send calls
+        # can end up retrying around the same moment (e.g. a fleet-wide restart), and a fixed wait
+        # keeps them all retrying in lockstep instead of spreading the load out.
         iq = None
         for i in range(self._safe_send_attempts):
             try:
@@ -857,11 +862,11 @@ class XmppComm(Comm):
             except slixmpp.exceptions.IqTimeout as timeout:
                 # timeout occurred, try again after some wait
                 iq = timeout.iq
-                await asyncio.sleep(self._safe_send_wait)
+                await asyncio.sleep(_retry_delay(i + 1, cap=self._safe_send_wait * 4, base=self._safe_send_wait))
 
             except TimeoutError:
                 # our own timeout fired instead of slixmpp's, try again after some wait
-                await asyncio.sleep(self._safe_send_wait)
+                await asyncio.sleep(_retry_delay(i + 1, cap=self._safe_send_wait * 4, base=self._safe_send_wait))
 
         # never should reach this
         raise slixmpp.exceptions.IqTimeout(iq)

{pyobs_core-2.0.0.dev33.dist-info → pyobs_core-2.0.0.dev35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyobs-core
-Version: 2.0.0.dev33
+Version: 2.0.0.dev35
 Summary: robotic telescope software
 Author-email: Tim-Oliver Husser <thusser@uni-goettingen.de>
 License-Expression: MIT

{pyobs_core-2.0.0.dev33.dist-info → pyobs_core-2.0.0.dev35.dist-info}/RECORD

@@ -10,7 +10,7 @@ pyobs/cli/pyobs.py,sha256=h4XrVrk3kwFu5h-3b7qIpIxYyhdBkwPdhttgGsB7Ztg,3643
 pyobs/cli/pyobsd.py,sha256=maIaJY4DrbmI6Zr9yypSnEUNjoiWV25ldwSy08E4ATE,16089
 pyobs/cli/pyobsw.py,sha256=uXrJoz8fpGjADPUyf0-MxNcCKqVK2PkI8i9TWS-VS7w,740
 pyobs/comm/__init__.py,sha256=Pc_hlxXLcVf5sWtf_wCJ9PbC1_sGJHaNsF6qWBEQJzU,1567
-pyobs/comm/comm.py,sha256=z4JgMsRKrPQEFKQ2JmrtaIVn0a9c1LVrZ6-aYNR520s,24308
+pyobs/comm/comm.py,sha256=yWijexMdfnFxGSir10iZENC-2tk-fNG4zfyeDEDQyX0,25355
 pyobs/comm/commlogging.py,sha256=ycilwfEnCfEDY8Ya9_a5y9TqMsk6alFP8QQbWsIwHrU,1273
 pyobs/comm/proxy.py,sha256=38R5vIe9PVQotMaA010f83Q819KWeYR3kFkL7Xj3Cng,8277
 pyobs/comm/dummy/__init__.py,sha256=TwLSVExj81QPeIsd-pQR_FRRDWk-ueaCKITywxdW9l4,58
@@ -22,7 +22,7 @@ pyobs/comm/xmpp/__init__.py,sha256=U8A_ZAdKS3qH-SjdzZ28tEBzCrnnpAL3qrfoEl92Q_E,5
 pyobs/comm/xmpp/rpc.py,sha256=gUenqPK3FedaJCFOxc-uJ_bqokmkyXkoQ2wk2mkZrk8,14917
 pyobs/comm/xmpp/serializer.py,sha256=HFCPuzWIp3lnnJH_8WHiagzVUQaXyJEhKw6wZ1uPnw0,18999
 pyobs/comm/xmpp/xmppclient.py,sha256=d-5NqQ2ZXBFiyLbqdaJHrXVNrS4Z_19Zrnnjtsd_Fcs,7940
-pyobs/comm/xmpp/xmppcomm.py,sha256=evMiP5oSXXJx2aoeoNDZdsjM2WWTJmsznGKpzJVVsBM,46791
+pyobs/comm/xmpp/xmppcomm.py,sha256=fn3ygQtQNCf_sKicPSSzcjPzln665Wr83OZyHUxuolw,47449
 pyobs/comm/xmpp/xep_0009/__init__.py,sha256=YbgcfeEcRH-M3HQ0IyHEPhPLHIj8xcWYKHSRYIIuX8k,103
 pyobs/comm/xmpp/xep_0009/binding.py,sha256=bbBwpc68e9hkt9hwU8AE_OHpt-Rpakl6JvNAg2xFHZM,5995
 pyobs/comm/xmpp/xep_0009/rpc.py,sha256=_Xzzghl4yDsdVwjL3QjmgzaiqAYhQN0y9R4vlYnTinw,2067
@@ -439,8 +439,8 @@ pyobs/vfs/vfs.py,sha256=buHTmO6VUjSypkEMVxY8rDKrpMz65AY2OE2hGEsQsLI,10780
 pyobs/vfs/filelists/__init__.py,sha256=NaTGFjLGh043j_F7kWEx_cXaII7t3CbYguRk2g5hEqw,111
 pyobs/vfs/filelists/filelist.py,sha256=kCco_5G2gLH-nxWik-wcs6lGuc_-3LeeyR9L4_srf30,201
 pyobs/vfs/filelists/testing.py,sha256=M8f2BULdjRCc7JFOKhAH7Kwre_uVQC0xLcv9xGTfNFw,425
-pyobs_core-2.0.0.dev33.dist-info/METADATA,sha256=2Olhqmx2UC2RvWVLS3XwpTf3IPObJWC3YWLxv8yrpTs,1990
-pyobs_core-2.0.0.dev33.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-pyobs_core-2.0.0.dev33.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
-pyobs_core-2.0.0.dev33.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
-pyobs_core-2.0.0.dev33.dist-info/RECORD,,
+pyobs_core-2.0.0.dev35.dist-info/METADATA,sha256=eDZCP4-8pQGk0ZKlg5q_kip1tHozwfCQ0rMCOpld5Po,1990
+pyobs_core-2.0.0.dev35.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+pyobs_core-2.0.0.dev35.dist-info/entry_points.txt,sha256=0ceIn3dTDwWdGdJ5VdTvYim7vKkdTe6aqqpoaG065UY,109
+pyobs_core-2.0.0.dev35.dist-info/licenses/LICENSE,sha256=gC8djBliCENDmuRvzCoejpWbsn8eqKx61Hc8bmDZ2LI,1099
+pyobs_core-2.0.0.dev35.dist-info/RECORD,,