From 1678360e3b546dbd22e0dee023570596e5f9d911 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 31 Jul 2013 15:32:54 -0700 Subject: [PATCH] Handle log paths in logstash gearman client better * modules/openstack_project/files/logstash/log-gearman-client.py: Use os.path.join to join the base log path provided by Jenkins and the log file provided in the gearman client config. This avoid needing to worry about trailing slashes in the Jenkins provided path. Change-Id: I973237dae6f0b7947d322489108a05a99a7cc0be --- modules/openstack_project/files/logstash/log-gearman-client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/files/logstash/log-gearman-client.py b/modules/openstack_project/files/logstash/log-gearman-client.py index 4816b94ac7..418d92848a 100644 --- a/modules/openstack_project/files/logstash/log-gearman-client.py +++ b/modules/openstack_project/files/logstash/log-gearman-client.py @@ -19,6 +19,7 @@ import daemon import gear import json import logging +import os import signal import threading import yaml @@ -101,7 +102,7 @@ class EventProcessor(threading.Thread): fields = self._parse_fields(event, fileopts['name']) log_dir = self._get_log_dir(event) source_url = fileopts.get('source-url', self.source_url) + '/' + \ - log_dir + fileopts['name'] + os.path.join(log_dir, fileopts['name']) out_event = {} out_event["@fields"] = fields out_event["@tags"] = [fileopts['name']] + fileopts.get('tags', [])