From 58cd0d03b12f2107a4fcd464be7928c2f87639d3 Mon Sep 17 00:00:00 2001
From: karlicoss <karlicoss@gmail.com>
Date: Tue, 7 Nov 2023 19:38:56 +0000
Subject: [PATCH] export: fix handling of 504 Gateway Time-out

---
 src/instapexport/export.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/instapexport/export.py b/src/instapexport/export.py
index b868877..575c756 100755
--- a/src/instapexport/export.py
+++ b/src/instapexport/export.py
@@ -13,7 +13,7 @@
 # see https://github.com/rsgalloway/instapaper/issues/11
 from tenacity import (
     retry,
-    retry_if_exception_message,
+    retry_if_exception,
     wait_exponential,
     stop_after_attempt,
     before_sleep_log,
@@ -42,7 +42,8 @@ def get_json(
 
     # very rarely, we get one off 504 Gateway Time-out, usually retrying immediately after works
     @retry(
-        retry=retry_if_exception_message(match='.*504 Gateway Time-out.*'),
+        # retry=retry_if_exception_message(match='.*504 Gateway Time-out.*')  # hmm this isn't working because it can't match multiline?
+        retry=retry_if_exception(predicate=lambda e: '504 Gateway Time-out' in str(e)),
         wait=wait_exponential(max=10),
         stop=stop_after_attempt(5),
         before_sleep=before_sleep_log(logger, logging.INFO),
@@ -65,6 +66,7 @@ def query_api() -> Json:
             'folders': user_folders,
             'bookmarks': bookmarks,
         }
+
     return query_api()