Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
agent
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
7
Merge Requests
0
Wiki
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b2b74fcb
authored
Nov 19, 2018
by
Czémán Arnold
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue_22' into 'master'
Upgrade psutil See merge request
!9
parents
bf9d164c
23fd3b62
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
agent.py
+1
-1
requirements.txt
+1
-1
No files found.
agent.py
View file @
b2b74fcb
...
@@ -85,7 +85,7 @@ class SerialLineReceiver(SerialLineReceiverBase):
...
@@ -85,7 +85,7 @@ class SerialLineReceiver(SerialLineReceiverBase):
"swap"
:
dict
(
psutil
.
swap_memory
()
.
_asdict
()),
"swap"
:
dict
(
psutil
.
swap_memory
()
.
_asdict
()),
"uptime"
:
{
"seconds"
:
uptime
.
uptime
()},
"uptime"
:
{
"seconds"
:
uptime
.
uptime
()},
"disk"
:
disk_usage
,
"disk"
:
disk_usage
,
"user"
:
{
"count"
:
len
(
psutil
.
get_
users
())}}
"user"
:
{
"count"
:
len
(
psutil
.
users
())}}
self
.
send_response
(
response
=
'status'
,
args
=
args
)
self
.
send_response
(
response
=
'status'
,
args
=
args
)
logger
.
debug
(
"send_status finished"
)
logger
.
debug
(
"send_status finished"
)
...
...
requirements.txt
View file @
b2b74fcb
Twisted
==13.2.0
Twisted
==13.2.0
pyserial
==2.7
pyserial
==2.7
psutil
==
1.2.1
psutil
==
5.4.8
uptime
==3.0.1
uptime
==3.0.1
netifaces
==0.10.4
netifaces
==0.10.4
netaddr
==0.7.12
netaddr
==0.7.12
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment