merge hotfix for exception handling

traptor/traptor.py

@@ -19,6 +19,8 @@
 from tenacity import retry, wait_exponential, stop_after_attempt, retry_if_exception_type, wait_chain, wait_fixed
 
 from dog_whistle import dw_config, dw_callback
+from requests.exceptions import ChunkedEncodingError
+
 from scutils.log_factory import LogFactory
 from scutils.stats_collector import StatsCollector
 from traptor_limit_counter import TraptorLimitCounter
@@ -1101,8 +1103,17 @@ def run(self):
 
             self.restart_flag = False
 
-            # Start collecting data
-            self._main_loop()
+            try:
+                # Start collecting data
+                self._main_loop()
+            except ChunkedEncodingError as e:
+                self.logger.error("Ran into a ChunkedEncodingError while processing "
+                                  "tweets. Restarting Traptor from top of main process "
+                                  "loop", {
+                    'ex' : traceback.format_exc()
+                })
+
+
 
 
 def main():
@@ -1193,7 +1204,7 @@ def main():
 
         dd_monitoring.increment('traptor_error_occurred',
                                 tags=['error_type:traptor_start'])
-
+        raise e
 
 if __name__ == '__main__':
     from raven import Client

traptor/version.py

@@ -1,4 +1,4 @@
-__version__ = '1.4.12.0'
+__version__ = '1.4.12.1'
 
 if __name__ == '__main__':
     print(__version__)