Skip to content

Attempt to comply with psutil v2 API. #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2015
Merged

Attempt to comply with psutil v2 API. #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd62099
Attempt to comply with psutil v2 API.
Oct 19, 2015
b1e070d
Restore support for psutil V1 API.
Oct 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions sensors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@

import psutil as ps

ps_v1_api = int(ps.__version__.split('.')[0]) <= 1


B_UNITS = ['', 'KB', 'MB', 'GB', 'TB']
cpu_load = []

Expand Down Expand Up @@ -332,6 +335,10 @@ class CPUSensor(BaseSensor):
desc = _('Average CPU usage')
cpus = re.compile("\Acpu\d*\Z")
last = None
if ps_v1_api:
cpu_count = ps.NUM_CPUS
else:
cpu_count = ps.cpu_count()

def check(self, sensor):
if self.cpus.match(sensor):
Expand All @@ -340,9 +347,9 @@ def check(self, sensor):
else:
nber = int(sensor[3:]) if len(sensor) > 3 else 999

if nber >= ps.NUM_CPUS:
if nber >= self.cpu_count:
print(sensor)
print(ps.NUM_CPUS)
print(self.cpu_count)
print(len(sensor))
raise ISMError(_("Invalid number of CPUs."))

Expand All @@ -365,7 +372,7 @@ def _fetch_cpu(self, percpu=False):
for i in cpu_load:
r += i

r /= ps.NUM_CPUS
r /= self.cpu_count

return r

Expand Down