Merge pull request #233 feature-NEWDWH2021-1140 into develop

ecs/jskult-batch-daily/src/db/database.py

@@ -83,7 +83,9 @@ class Database:
             min=environment.DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS,
             max=environment.DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS
         ),
-        stop=stop_after_attempt(environment.DB_CONNECTION_MAX_RETRY_ATTEMPT))
+        stop=stop_after_attempt(environment.DB_CONNECTION_MAX_RETRY_ATTEMPT),
+        retry_error_cls=DBException
+    )
     def connect(self):
         """
         DBに接続します。接続に失敗した場合、リトライします。\n

ecs/jskult-batch-monthly/src/db/database.py

@@ -1,11 +1,10 @@
 from sqlalchemy import (Connection, CursorResult, Engine, QueuePool,
                         create_engine, text)
 from sqlalchemy.engine.url import URL
-from tenacity import retry, stop_after_attempt, wait_exponential
-
 from src.error.exceptions import DBException
 from src.logging.get_logger import get_logger
 from src.system_var import environment
+from tenacity import retry, stop_after_attempt, wait_exponential
 
 logger = get_logger(__name__)
 
@@ -74,7 +73,9 @@ class Database:
             min=environment.DB_CONNECTION_RETRY_INTERVAL_MIN_SECONDS,
             max=environment.DB_CONNECTION_RETRY_INTERVAL_MAX_SECONDS
         ),
-        stop=stop_after_attempt(environment.DB_CONNECTION_MAX_RETRY_ATTEMPT))
+        stop=stop_after_attempt(environment.DB_CONNECTION_MAX_RETRY_ATTEMPT),
+        retry_error_cls=DBException
+        )
     def connect(self):
         """
         DBに接続します。接続に失敗した場合、リトライします。