From fd2084a33ef8f87750412207c59e4ad77f9df983 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 23 Sep 2010 13:01:13 -0400 Subject: [PATCH] Handle the case if there's no global_conf (like in functional tests). --- lib/galaxy/config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 5cd7abd4184..af1bc89fa6d 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -117,7 +117,8 @@ class Configuration( object ): if global_conf and "__file__" in global_conf: global_conf_parser.read(global_conf['__file__']) # Heartbeat log file name override - self.heartbeat_log = global_conf.get( 'heartbeat_log', 'heartbeat.log' ) + if global_conf is not None: + self.heartbeat_log = global_conf.get( 'heartbeat_log', 'heartbeat.log' ) #Store per-tool runner config try: self.tool_runners = global_conf_parser.items("galaxy:tool_runners")