From b1f49d3c8dfc837948da7ac8bc1770dfd1ee9d98 Mon Sep 17 00:00:00 2001
From: Frederic Fortier <fredfortier@gmail.com>
Date: Fri, 29 Dec 2017 16:14:26 -0500
Subject: [PATCH] BLD: trying redo for retrying calls as suggesting in issue
 #121

---
 catalyst/exchange/exchange_blotter.py | 41 +++++++++++----------------
 etc/requirements.txt                  |  1 +
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/catalyst/exchange/exchange_blotter.py b/catalyst/exchange/exchange_blotter.py
index afd5603b..19073b05 100644
--- a/catalyst/exchange/exchange_blotter.py
+++ b/catalyst/exchange/exchange_blotter.py
@@ -3,6 +3,7 @@ from time import sleep
 import pandas as pd
 from catalyst.assets._assets import TradingPair
 from logbook import Logger
+from redo import retry
 
 from catalyst.constants import LOG_LEVEL
 from catalyst.exchange.exchange_errors import ExchangeRequestError, \
@@ -260,40 +261,32 @@ class ExchangeBlotter(Blotter):
                         )
                     )
 
-    def get_exchange_transactions(self, attempt_index=0):
+    def get_exchange_transactions(self):
         closed_orders = []
         transactions = []
         commissions = []
 
-        try:
-            for order, txn in self.check_open_orders():
-                order.dt = txn.dt
+        for order, txn in self.check_open_orders():
+            order.dt = txn.dt
 
-                transactions.append(txn)
+            transactions.append(txn)
 
-                if not order.open:
-                    closed_orders.append(order)
+            if not order.open:
+                closed_orders.append(order)
 
-            return transactions, commissions, closed_orders
-
-        except ExchangeRequestError as e:
-            log.warn(
-                'check open orders attempt {}: {}'.format(attempt_index, e)
-            )
-            if attempt_index < self.retry_check_open_orders:
-                sleep(self.retry_delay)
-                return self.get_exchange_transactions(attempt_index + 1)
-
-            else:
-                raise ExchangePortfolioDataError(
-                    data_type='order-status',
-                    attempts=attempt_index,
-                    error=e
-                )
+        return transactions, commissions, closed_orders
 
     def get_transactions(self, bar_data):
         if self.simulate_orders:
             return super(ExchangeBlotter, self).get_transactions(bar_data)
 
         else:
-            return self.get_exchange_transactions()
+            return retry(
+                action=self.get_exchange_transactions,
+                attempts=self.retry_check_open_orders,
+                sleeptime=self.retry_delay,
+                retry_exceptions=ExchangeRequestError,
+                cleanup=lambda e: log.warn(
+                    'fetching exchange transactions again: {}'.format(e)
+                )
+            )
diff --git a/etc/requirements.txt b/etc/requirements.txt
index 5aa8ccb2..cc009908 100644
--- a/etc/requirements.txt
+++ b/etc/requirements.txt
@@ -83,3 +83,4 @@ tables==3.3.0
 #Catalyst dependencies
 ccxt==1.10.283
 boto3==1.4.8
+redo==1.6