From 0e66fcdce184bcaa2b65108d913458b4d01fa5c4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 19 Jul 2013 11:38:26 -0700 Subject: [PATCH] Properly root log path in logstash gearman client. * modules/openstack_project/files/logstash/log-gearman-client.py: BASE_LOG_PATH is a relative dir and is not rooted. Provide the root '/' when constructing the source URL for the gearman workers. Change-Id: I8fcfa19b048019398ffd370d74c271b9656a8688 --- .../openstack_project/files/logstash/log-gearman-client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/logstash/log-gearman-client.py b/modules/openstack_project/files/logstash/log-gearman-client.py index d905129248..5ac7a32b8e 100644 --- a/modules/openstack_project/files/logstash/log-gearman-client.py +++ b/modules/openstack_project/files/logstash/log-gearman-client.py @@ -76,7 +76,7 @@ class EventProcessor(threading.Thread): def _get_log_dir(self, event): parameters = event["build"].get("parameters", {}) - base = parameters.get('BASE_LOG_PATH', '/periodic') + base = parameters.get('BASE_LOG_PATH', 'periodic') base += '/{name}/{number}/'.format( name=event.get("name", "UNKNOWN"), number=event["build"].get("number", "UNKNOWN")) @@ -102,7 +102,7 @@ class EventProcessor(threading.Thread): def _parse_event(self, event, fileopts): fields = self._parse_fields(event, fileopts['name']) log_dir = self._get_log_dir(event) - source_url = fileopts.get('source-url', self.source_url) + \ + source_url = fileopts.get('source-url', self.source_url) + '/' + \ log_dir + fileopts['name'] out_event = {} out_event["@fields"] = fields