Correct some PEP on the brand new RabbitMQ export module

This commit is contained in:
nicolargo 2015-04-12 21:40:46 +02:00
parent e0205a9e4a
commit 49a579d6d1
5 changed files with 15 additions and 7 deletions

3
NEWS
View File

@ -10,7 +10,8 @@ Enhancements and news features:
* Grab FAN speed in the Glances sensors plugin (issue #501) * Grab FAN speed in the Glances sensors plugin (issue #501)
* Allow logical mounts points in the FS plugin (issue #448) * Allow logical mounts points in the FS plugin (issue #448)
* Add a --disable-hddtemp to disable HDD temperature module at startup (issue #515) * Add a --disable-hddtemp to disable HDD temperature module at startup (issue #515)
* Add a quiet mode (-q). Can be usefull if you need a Statsd or Influxdb provider only. * Add a quiet mode (-q). Can be usefull if you need a Statsd or Influxdb provider only
* Add RabbitMQ export module (issue #540 Thk to @Katyucha)
Bugs corrected: Bugs corrected:

View File

@ -186,3 +186,10 @@ db=glances
host=localhost host=localhost
port=8125 port=8125
#prefix=glances #prefix=glances
[rabbitmq]
host=localhost
port=5672
user=guest
password=guest
queue=glances_queue

View File

@ -181,6 +181,6 @@ port=8125
[rabbitmq] [rabbitmq]
host=localhost host=localhost
port=5672 port=5672
user=glances user=guest
password=glances password=guest
queue=glances_queue queue=glances_queue

View File

@ -100,6 +100,6 @@ class Export(GlancesExport):
data += ", " + columns[i] + "=" + str(points[i]) data += ", " + columns[i] + "=" + str(points[i])
logger.debug(data) logger.debug(data)
try: try:
self.client.basic_publish(exchange='', routing_key="glances_queue", body=data) self.client.basic_publish(exchange='', routing_key=self.rabbitmq_queue, body=data)
except Exception as e: except Exception as e:
logger.error("Can not export stats to RabbitMQ (%s)" % e) logger.error("Can not export stats to RabbitMQ (%s)" % e)

View File

@ -73,7 +73,7 @@ setup(
'BROWSER': ['zeroconf>=0.16', 'netifaces'], 'BROWSER': ['zeroconf>=0.16', 'netifaces'],
'RAID': ['pymdstat'], 'RAID': ['pymdstat'],
'DOCKER': ['docker-py'], 'DOCKER': ['docker-py'],
'EXPORT': ['influxdb>=1.0.0', 'statsd'], 'EXPORT': ['influxdb>=1.0.0', 'statsd', 'pika'],
'ACTION': ['pystache'] 'ACTION': ['pystache']
}, },
packages=['glances'], packages=['glances'],