From 773788cbcec1d715bdd2f3bf0d23ecdcd39a29b8 Mon Sep 17 00:00:00 2001
From: Luis Pigueiras <luis.pigueiras@cern.ch>
Date: Fri, 10 Feb 2017 11:10:18 +0100
Subject: [PATCH 1/3] [OS-4192] Fix crash when there are no queues in rabbit
---
src/sensor-rabbitmq.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/sensor-rabbitmq.py b/src/sensor-rabbitmq.py
index 3bd6f4e..b160fe5 100644
--- a/src/sensor-rabbitmq.py
+++ b/src/sensor-rabbitmq.py
@@ -49,11 +49,14 @@ class Message(Metric):
self.log(SENSOR_LOG_ERROR, str(e))
return -1
- data = json.loads(response)
- messages = data['queue_totals']['messages']
+ try:
+ data = json.loads(response)
+ messages = data['queue_totals']['messages']
+ except KeyError as e:
+ # There are no messages
+ messages = 0
self.storeSample01(messages)
-
return 0
class Partition(Metric):
@@ -145,4 +148,4 @@ class MessageRate(Metric):
self.storeSample01(value)
- return 0
\ No newline at end of file
+ return 0
--
GitLab
From 8d1d7b411da5f02e4be2803dc02f9a401f9382b4 Mon Sep 17 00:00:00 2001
From: Luis Pigueiras <luis.pigueiras@cern.ch>
Date: Fri, 10 Feb 2017 11:11:57 +0100
Subject: [PATCH 2/3] [OS-4192] Add gitlab-ci job to build the package
---
.gitlab-ci.yml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..5dce8a1
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,20 @@
+stages:
+ - build
+ - deploy
+rpmbuild:
+ stage: build
+ image: gitlab-registry.cern.ch/cloud/ciadm
+ script:
+ - curl https://gitlab.cern.ch/cloud-infrastructure/cloud-dev/raw/master/gitlab/rpmbuild.sh | bash
+kojicheck:
+ stage: build
+ image: gitlab-registry.cern.ch/cloud/ciadm
+ script:
+ - curl https://gitlab.cern.ch/cloud-infrastructure/cloud-dev/raw/master/gitlab/kojicheck.sh | bash
+kojibuild:
+ stage: deploy
+ image: gitlab-registry.cern.ch/cloud/ciadm
+ only:
+ - tags
+ script:
+ - curl https://gitlab.cern.ch/cloud-infrastructure/cloud-dev/raw/master/gitlab/kojibuild.sh | bash
--
GitLab
From 8159100a867087cdd3504c5bc2efd5511a14d5b3 Mon Sep 17 00:00:00 2001
From: Luis Pigueiras <luis.pigueiras@cern.ch>
Date: Fri, 10 Feb 2017 11:20:30 +0100
Subject: [PATCH 3/3] [OS-4192] Bump to version 1.1-1
---
ChangeLog | 5 ++++-
lemon-sensor-rabbitmq.spec | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 525f552..d5c586c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* 2017-02-10 Luis Pigueiras <luis.pigueiras@cern.ch> 1.1-1
+- Fix crash when there are no queues in rabbit
+
* 2015-06-03 Stefano Zilli <stefano.zilli@cern.ch> 1.0.1-2
- Using multivalued meters for message rates
@@ -5,4 +8,4 @@
- Added message rates
* 2014-11-12 Stefano Zilli <stefano.zilli@cern.ch> 1.0.0-1
-- First release
\ No newline at end of file
+- First release
diff --git a/lemon-sensor-rabbitmq.spec b/lemon-sensor-rabbitmq.spec
index 46c5180..7e0d4dc 100644
--- a/lemon-sensor-rabbitmq.spec
+++ b/lemon-sensor-rabbitmq.spec
@@ -1,8 +1,8 @@
# Specfile
Summary: Lemon sensor rabbitmq
Name: lemon-sensor-rabbitmq
-Version: 1.0.1
-Release: 2
+Version: 1.1
+Release: 1
License: GPL
Group: System Environment/Base
BuildRoot: %{_tmppath}/%{name}-root
--
GitLab