Commit 80111f94 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'origin/master' into zope4py2

parents af95aea7 0baefb41
...@@ -108,7 +108,7 @@ md5sum = 5bf57a9074ea5b054d999789cbbe2c87 ...@@ -108,7 +108,7 @@ md5sum = 5bf57a9074ea5b054d999789cbbe2c87
[cpu-temperature-promise] [cpu-temperature-promise]
_update_hash_filename_ = promise/check_cpu_temperature.py _update_hash_filename_ = promise/check_cpu_temperature.py
md5sum = 979a5a3a1eb9d0b081fa014baeef706f md5sum = 6812310b65c2d95815afc2b034a5f90f
[interface-up-promise] [interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.py _update_hash_filename_ = promise/check_interface_up.py
......
...@@ -79,7 +79,7 @@ class RunPromise(GenericPromise): ...@@ -79,7 +79,7 @@ class RunPromise(GenericPromise):
data = psutil.sensors_temperatures() data = psutil.sensors_temperatures()
cpu_temp = data['coretemp'][0][1] cpu_temp = data['coretemp'][0][1]
l = get_data_interval(self.__log_file, max_avg_temp_duration) l = get_data_interval(self.__log_file, max_avg_temp_duration) or [{'cpu_temperature': cpu_temp}]
avg_temp = sum(map(lambda x: x['cpu_temperature'], l)) / len(l) avg_temp = sum(map(lambda x: x['cpu_temperature'], l)) / len(l)
data = json.dumps({'cpu_temperature': cpu_temp, 'avg_cpu_temperature': avg_temp}) data = json.dumps({'cpu_temperature': cpu_temp, 'avg_cpu_temperature': avg_temp})
......
...@@ -902,6 +902,9 @@ webcolors = 1.10 ...@@ -902,6 +902,9 @@ webcolors = 1.10
rfc3987 = 1.3.8 rfc3987 = 1.3.8
jsonpointer = 2.2 jsonpointer = 2.2
pandas = 0.19.2
numpy = 1.13.1
scipy = 0.19.0
# WIP Zope 4 ⚠ # WIP Zope 4 ⚠
Products.CMFCore = 2.6.0 Products.CMFCore = 2.6.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment