diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..5dce8a16c0bb8418df3a9274cc604be43306de55 --- /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 diff --git a/ChangeLog b/ChangeLog index 525f552aaa7adba833b6d4f0bc7a5a93a259a82d..d5c586c97a0510ca2aeaac494d549a7f9c947b3b 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 46c51803e2d85ddd6541bb18ccc4ad997bd6dc8f..7e0d4dc14e3f69847e71ab3c19485a356f73771f 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 diff --git a/src/sensor-rabbitmq.py b/src/sensor-rabbitmq.py index 3bd6f4e20b04eda89a6068a2668f30e96a708b86..b160fe51f7fb5ffcde0c3f2f7d7b744f2113ec43 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