From dfaf32acbb47f4af6831e36e3b483c922654f64f Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 16 Aug 2010 11:17:39 -0400 Subject: [PATCH] Allow command-line paste serve var 'heartbeat_log' to override heartbeat log filename, done like this so we can use a single config file for multiple instances but prevent them from clobbering file names. --- lib/galaxy/app.py | 2 +- lib/galaxy/config.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py index 0730ef6bc4b..acfbf99942e 100644 --- a/lib/galaxy/app.py +++ b/lib/galaxy/app.py @@ -60,7 +60,7 @@ class UniverseApplication( object ): if self.config.use_heartbeat: from galaxy.util import heartbeat if heartbeat.Heartbeat: - self.heartbeat = heartbeat.Heartbeat() + self.heartbeat = heartbeat.Heartbeat( fname=self.config.heartbeat_log ) self.heartbeat.start() # Enable the memdump signal catcher if configured and available if self.config.use_memdump: diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 762ee9856be..c3bcb8314c3 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -114,6 +114,8 @@ class Configuration( object ): self.global_conf_parser = global_conf_parser 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' ) #Store per-tool runner config try: self.tool_runners = global_conf_parser.items("galaxy:tool_runners")