From fa7d1e5e681130fe727600e2952580f5b8a2f23a Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Wed, 12 Jun 2013 17:08:20 -0700
Subject: [PATCH] Have logstash be less verbose on 404 errors.

Change-Id: Ie6905039d4752d578566861ffd340cf607ad270b
Reviewed-on: https://review.openstack.org/32819
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
---
 .../files/logstash/log-gearman-worker.py                  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/files/logstash/log-gearman-worker.py b/modules/openstack_project/files/logstash/log-gearman-worker.py
index 18921b1abf..48c0943e5e 100644
--- a/modules/openstack_project/files/logstash/log-gearman-worker.py
+++ b/modules/openstack_project/files/logstash/log-gearman-worker.py
@@ -95,7 +95,13 @@ class LogRetriever(threading.Thread):
         raw_buf = b''
         try:
             gzipped, raw_buf = self._get_log_data(source_url, retry)
-        except:
+        except urllib2.HTTPError, e:
+            if e.code == 404:
+                logging.info("Unable to retrieve %s: HTTP error 404" %
+                             source_url)
+            else:
+                logging.exception("Unable to get log data.")
+        except Exception:
             # Silently drop fatal errors when retrieving logs.
             # TODO (clarkb): Handle these errors.
             # Perhaps simply add a log message to raw_buf?