pyrelukko 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

pyrelukko/pyrelukko.py

@@ -39,6 +39,8 @@ RETRY_KWARGS = [
 OWN_KWARGS = [
     'acquire_wait_for_timeout',
     'acquire_modulo',
+    'disable_websocket',
+    'raise_when_acquire_fails',
     'ws_ping_interval',
     'ws_ping_timeout',
     'ws_wait_for_timeout',
@@ -75,11 +77,13 @@ class RelukkoClient:
         )
         self._setup_session(api_key, **kwargs)
         self._setup_http_adapters_retry(**kwargs)
-        self.ws_wait_for_timeout = 2
+        self.acquire_modulo = 100
+        self.acquire_wait_for_timeout = 2
+        self.disable_websocket = False
+        self.raise_when_acquire_fails = True
         self.ws_ping_interval = 60
         self.ws_ping_timeout = 20
-        self.acquire_wait_for_timeout = 2
-        self.acquire_modulo = 100
+        self.ws_wait_for_timeout = 2
         self._setup_pyrelukko_kwargs(**kwargs)
 
         self.base_url = self._setup_base_url(base_url)
@@ -224,22 +228,29 @@ class RelukkoClient:
             if elapsed_time > max_run_time:
                 self.ws_running.clear()
                 _thread_store.insert(0, None)
-                return
+                break
             # If self.message_recieved is True try to get lock ASAP!
             # Otherwise only in every Xth run in case websocket broke.
             if got_message or loop_counter % self.acquire_modulo == 0:
-                res = self._make_request(
-                    url=url, method="POST", payload=payload)
+                try:
+                    res = self._make_request(
+                        url=url, method="POST", payload=payload)
+                except (
+                    *self.exceptions, RuntimeError, requests.HTTPError) as e:
+                    logger.warning("Last exception was: %s!\nGiving up!", e)
+                    _thread_store.insert(0, e)
+                    break
             loop_counter += 1
             if res is None:
                 # Conflict 409
                 got_message = self.message_received.wait(
                     timeout=self.acquire_wait_for_timeout)
                 self.message_received.clear()
-            else:
-                _thread_store.insert(0, res)
-                self.ws_running.clear()
-                return
+                continue
+
+            _thread_store.insert(0, res)
+            self.ws_running.clear()
+            break
 
     def _check_response(self, response: requests.Response):
         match response.status_code:
@@ -247,20 +258,27 @@ class RelukkoClient:
                 return response.json()
             case 400 | 403:
                 err = response.json()
-                logger.warning(err.get('status'), err.get('message'))
+                logger.warning("4xx HTTP Error [%d](%s) - %s:%s",
+                    response.status_code, response.reason,
+                    str(err.get('status')), err.get('message'))
                 response.raise_for_status()
             case 409:
                 err = response.json()
-                logger.info(err.get('status'), err.get('message'))
+                logger.warning("409 HTTP Error [%d](%s) - %s:%s",
+                    response.status_code, response.reason,
+                    str(err.get('status')), err.get('message'))
                 return None
             case 500 | 502 | 503 | 504:
                 logger.warning("[%d](%s) %s",
                     response.status_code, response.reason, response.text)
-                raise RelukkoDoRetry()
+                raise RelukkoDoRetry(
+                    f"5xx HTTP Error: [{response.status_code}]"
+                    f"({response.reason})")
             case _:
                 logger.warning("[%d](%s) %s",
                     response.status_code, response.reason, response.text)
-                raise RuntimeError()
+                raise RuntimeError(
+                    f"Give up: [{response.status_code}]({response.reason})")
 
     def _make_request(
             self,
@@ -293,10 +311,11 @@ class RelukkoClient:
 
         url = f"{self.base_url}/v1/locks/"
 
-        self.ws_running.set()
-        self.ws_listener = threading.Thread(
-            target=asyncio.run, args=(self._websocket_listener(),))
-        self.ws_listener.start()
+        if not self.disable_websocket:
+            self.ws_running.set()
+            self.ws_listener = threading.Thread(
+                target=asyncio.run, args=(self._websocket_listener(),))
+            self.ws_listener.start()
 
         thread_store = []
         http_thread = threading.Thread(
@@ -304,9 +323,18 @@ class RelukkoClient:
             args=(url, max_run_time, payload, thread_store))
         http_thread.start()
         http_thread.join()
-        self.ws_listener.join()
 
-        return thread_store[0]
+        if not self.disable_websocket:
+            self.ws_listener.join()
+
+        if thread_store:
+            if (
+                self.raise_when_acquire_fails
+                and isinstance(thread_store[0], Exception)
+            ):
+                raise thread_store[0]
+            return thread_store[0]
+        return None
 
     def get_lock(self, lock_id: str) -> Dict:
         """

pyrelukko/version.py

@@ -1,2 +1,2 @@
 # pylint: disable=all
-__version__ = "0.5.0"
+__version__ = "0.6.0"

{pyrelukko-0.5.0.dist-info → pyrelukko-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyrelukko
-Version: 0.5.0
+Version: 0.6.0
 Summary: Relukko client.
 Author-email: Reto Zingg <g.d0b3rm4n@gmail.com>
 Requires-Python: >=3.10

pyrelukko-0.6.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
+pyrelukko/pyrelukko.py,sha256=Pjn2pf4rg1rDgAHzUSFdLnooHttn0ZLh3g_29Fxi0RM,13499
+pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
+pyrelukko/testcontainers.py,sha256=mSUfnyBFVmt9N9LoI_EwXG4EomY8pQCvHzff2ESio-8,3354
+pyrelukko/version.py,sha256=q0h0LBikcev1aArInPZOcWowTR0WPbUbXJg_OX6XtkU,44
+pyrelukko-0.6.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
+pyrelukko-0.6.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+pyrelukko-0.6.0.dist-info/METADATA,sha256=DwCYVR3ps9F4ej1xrgd1DrYcvmZJR7liQ0nxjZfUf4w,887
+pyrelukko-0.6.0.dist-info/RECORD,,

pyrelukko-0.5.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-pyrelukko/__init__.py,sha256=n-mTJV7AOfr4bljtDxok3E3gXIBRk-kFa2_Ql3S8Ht0,61
-pyrelukko/pyrelukko.py,sha256=8ea0t-qoQqoP7K1BZ6iaDk2ZSsBxuY3J_Z24P8PdJdY,12335
-pyrelukko/retry.py,sha256=XeCc0trPhAggdEnu2nwtpFderlHaDQFTXH_O1dLeiGQ,1587
-pyrelukko/testcontainers.py,sha256=mSUfnyBFVmt9N9LoI_EwXG4EomY8pQCvHzff2ESio-8,3354
-pyrelukko/version.py,sha256=6G7fdnvpmeN8CdaYpJw3Od9s7r0YgcIf5M2MnU2YwDs,44
-pyrelukko-0.5.0.dist-info/LICENSE,sha256=aEI4dThWmRUiEPch0-KaZQmHZgTyuz88Edmp25H6tAw,1089
-pyrelukko-0.5.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pyrelukko-0.5.0.dist-info/METADATA,sha256=OhhPL2dubn9jQuSXoa57FTkf3-YkZPuXHvNEJn15aqw,887
-pyrelukko-0.5.0.dist-info/RECORD,,