Merge branch 'release/0.15.0'

Author: nrejac

CHANGELOG

@@ -1,3 +1,10 @@
+2016-02-12 v0.15.0
+
+ * Summary: Improved handling of network issues while sending to REDCap.
+
+ *   Adding exception handling for NewConnectionError in redi/utils/redcapClient.py (Nicholas Rejack)
+ *   Adding parenthesis to REDCAP_RECORDS_PROGRAM in vagrant/Makefile (Nicholas Rejack)
+
 2015-12-03 v0.14.4
  * Summary: RED-I now has built-in log rotation.
 

redi/redi.py

@@ -54,7 +54,7 @@
 """
 
 __author__ = "University of Florida CTS-IT Team"
-__version__ = "0.14.4"
+__version__ = "0.15.0"
 __email__ = "[email protected]"
 __status__ = "Development"
 

redi/utils/redcapClient.py

@@ -20,6 +20,7 @@
 from redcap import Project, RedcapError
 from requests import RequestException
 from requests.packages.urllib3.exceptions import MaxRetryError
+from requests.packages.urllib3.exceptions import NewConnectionError
 
 # Configure module's logger
 logger = logging.getLogger(__name__)
@@ -110,10 +111,13 @@ def send_data_to_redcap(self, data, max_retry_count, overwrite=False,
         try:
             # The following line simulates github issue #108:
             # raise MaxRetryError('', 'localhost:8998', None)
+            # The following line simulates 
+            #raise NewConnectionError('localhost:8998', 443)
             response = self.project.import_records(data,
                 overwrite=overwrite_value)
             return response
-        except MaxRetryError as e:
+        except (MaxRetryError, NewConnectionError) as e:
+            logger.error("Exception encountered: ", exc_info = True)
             logger.debug(e.message + ", Attempt no.: " + str(retry_count))
             if (retry_count == max_retry_count):
                 message = "Exiting since network connection timed out after"\

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='redi',
-    version='0.14.4',
+    version='0.15.0',
     author='https://www.ctsi.ufl.edu/research/study-development/informatics-consulting/',
     author_email='[email protected]',
     packages=find_packages(exclude=['test']),
@@ -27,7 +27,7 @@
         'redi': ['utils/*.xsl', 'utils/*.xsd']
     },
     url='https://github.com/ctsit/redi',
-    download_url = 'https://github.com/ctsit/redi/releases/tag/0.14.1',
+    download_url = 'https://github.com/ctsit/redi/releases/tag/0.15.0',
     keywords = ['EMR', 'EHR', 'REDCap', 'Clinical Data'],
     license='BSD 3-Clause',
     description='REDCap Electronic Data Importer',

vagrant/Makefile

@@ -22,7 +22,7 @@ ifneq ("$(wildcard $(MAKE_CONFIG_FILE))", "")
    REDCAP_VM_URI := $(subst api/,,$(REDCAP_API_URI))
    REDCAP_VM_TOKEN := $(shell cat ${CONFIG_FILE} | sed -e 's/ //g' | grep -v '^\#' | grep 'token=' | cut -d '=' -f2)
    REDCAP_RECORDS_PROGRAM:=redcap_records
-   REDCAP_RECORDS_CMD:=$REDCAP_RECORDS_PROGRAM --token=$(REDCAP_VM_TOKEN) --url=$(REDCAP_API_URI)
+   REDCAP_RECORDS_CMD:=$(REDCAP_RECORDS_PROGRAM) --token=$(REDCAP_VM_TOKEN) --url=$(REDCAP_API_URI)
    REDCAP_PROJECT_ID := $(shell cat ${MAKE_CONFIG_FILE} | sed -e 's/ //g' | grep -v '^\#' | grep 'redcap_project_id=' | cut -d '=' -f2)
    REDCAP_PROJECT_FORMS := $(shell cat ${MAKE_CONFIG_FILE} | sed -e 's/ //g' | grep -v '^\#' | grep 'redcap_project_forms=' | cut -d '=' -f2)
    REDCAP_PROJECT_ENROLLMENT_FORM := $(shell cat ${MAKE_CONFIG_FILE} | sed -e 's/ //g' | grep -v '^\#' | grep 'redcap_project_enrollment_form=' | cut -d '=' -f2)
@@ -102,7 +102,7 @@ check_config:
 	@test -f $(REDCAP_CODE_ZIP_FILE) || (echo 'Please obtain the redcap software zip file "$(REDCAP_CODE_ZIP_FILE)"' && exit 1)
 	@test -d $(REDCAP_CODE_PLUGIN_FOLDER) || (echo 'WARNING: did not find a REDCap plugins folder "$(REDCAP_CODE_PLUGIN_FOLDER)"')
 	@test -f $(ENROLLMENT_CSV_FILE) || (echo 'Config error: missing file "$(ENROLLMENT_CSV_FILE)"' && exit 1)
-	@which $REDCAP_RECORDS_PROGRAM || (echo 'Config error: missing redcap_records command.  Run "pip install redcap_cli" to install' && exit 1)
+	@which $(REDCAP_RECORDS_PROGRAM) || (echo 'Config error: missing redcap_records command.  Run "pip install redcap_cli" to install' && exit 1)
 
 show_config: check_config
 	@echo "$(MAKE_CONFIG_FILE) indicates that extra parameters should be read from : $(CONFIG_FILE)"