From 48cfa2b8aacbb55e19b90b985582b810c82095a7 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 24 Apr 2015 08:02:25 -0400 Subject: [PATCH 1/3] Logging fix in toolshed install manager. --- lib/tool_shed/galaxy_install/install_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tool_shed/galaxy_install/install_manager.py b/lib/tool_shed/galaxy_install/install_manager.py index d0bb3fe16d0..2c23a1fff64 100644 --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -1026,6 +1026,6 @@ def fetch_tool_versions( app, tool_shed_repository ): failed_to_fetch = True except Exception: failed_to_fetch = True - if failed_to_fetch: log.exception("Failed to fetch tool shed repository verion information.") + if failed_to_fetch: return FAILED_TO_FETCH_VERSIONS From 96091a5300d3ee21da9e8b683a376818b330c84c Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 24 Apr 2015 08:21:00 -0400 Subject: [PATCH 2/3] Add logging for the case where there's no response (but no exception) in install manager's check versions. --- lib/tool_shed/galaxy_install/install_manager.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/tool_shed/galaxy_install/install_manager.py b/lib/tool_shed/galaxy_install/install_manager.py index 2c23a1fff64..3551f1f5c18 100644 --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -1023,6 +1023,7 @@ def fetch_tool_versions( app, tool_shed_repository ): if text: return json.loads( text ) else: + log.error("No content returned from tool shed repository version request to %s", url) failed_to_fetch = True except Exception: failed_to_fetch = True From 54feee9071203ca34b05dfc3668149058f485aa3 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 24 Apr 2015 08:39:50 -0400 Subject: [PATCH 3/3] Fix old typo. --- lib/tool_shed/galaxy_install/install_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tool_shed/galaxy_install/install_manager.py b/lib/tool_shed/galaxy_install/install_manager.py index 3551f1f5c18..e6ab0c03e5f 100644 --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -1027,6 +1027,6 @@ def fetch_tool_versions( app, tool_shed_repository ): failed_to_fetch = True except Exception: failed_to_fetch = True - log.exception("Failed to fetch tool shed repository verion information.") + log.exception("Failed to fetch tool shed repository version information.") if failed_to_fetch: return FAILED_TO_FETCH_VERSIONS