Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
b93a5134
G
glances
项目概览
蜕变的菜鸟
/
glances
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
glances
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b93a5134
编写于
10月 09, 2014
作者:
N
Nicolargo
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'release/v2.1.2'
上级
287af375
45b78474
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
57 addition
and
13 deletion
+57
-13
.gitignore
.gitignore
+3
-0
NEWS
NEWS
+9
-0
docs/glances-doc.html
docs/glances-doc.html
+1
-1
docs/glances-doc.rst
docs/glances-doc.rst
+1
-1
glances/__init__.py
glances/__init__.py
+1
-1
glances/core/glances_processes.py
glances/core/glances_processes.py
+3
-0
glances/core/glances_standalone.py
glances/core/glances_standalone.py
+2
-2
glances/plugins/glances_processlist.py
glances/plugins/glances_processlist.py
+5
-3
man/glances.1
man/glances.1
+1
-1
setup.py
setup.py
+1
-1
tox.ini
tox.ini
+23
-0
unitest-restful.py
unitest-restful.py
+1
-1
unitest-xmlrpc.py
unitest-xmlrpc.py
+6
-2
未找到文件。
.gitignore
浏览文件 @
b93a5134
...
...
@@ -40,3 +40,6 @@ local.properties
# Sphinx
_build
# Tox
.tox/
NEWS
浏览文件 @
b93a5134
...
...
@@ -2,6 +2,15 @@
Glances Version 2.x
==============================================================================
Version 2.1.2
=============
Maintenance version (only needed for Mac OS X).
Bugs corrected:
* Mac OS X: Error if Glances is not ran with sudo (issue #426)
Version 2.1.1
=============
...
...
docs/glances-doc.html
浏览文件 @
b93a5134
...
...
@@ -123,7 +123,7 @@ td.option-group {
<div
class=
"document"
id=
"glances"
>
<h1
class=
"title"
>
Glances
</h1>
<p>
This manual describes
<em>
Glances
</em>
version 2.1.
1
.
</p>
<p>
This manual describes
<em>
Glances
</em>
version 2.1.
2
.
</p>
<p>
Copyright © 2012-2014 Nicolas Hennion
<
<a
class=
"reference external"
href=
"mailto:nicolas@nicolargo.com"
>
nicolas
@
nicolargo.com
</a>
>
</p>
<p>
October 2014
</p>
<div
class=
"contents topic"
id=
"table-of-contents"
>
...
...
docs/glances-doc.rst
浏览文件 @
b93a5134
...
...
@@ -2,7 +2,7 @@
Glances
=======
This manual describes *Glances* version 2.1.
1
.
This manual describes *Glances* version 2.1.
2
.
Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>
...
...
glances/__init__.py
浏览文件 @
b93a5134
...
...
@@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__
=
'glances'
__version__
=
'2.1.
1
'
__version__
=
'2.1.
2
'
__author__
=
'Nicolas Hennion <nicolas@nicolargo.com>'
__license__
=
'LGPL'
...
...
glances/core/glances_processes.py
浏览文件 @
b93a5134
...
...
@@ -147,6 +147,9 @@ class GlancesProcesses(object):
# Process CPU, MEM percent and name
procstat
.
update
(
proc
.
as_dict
(
attrs
=
[
'cpu_percent'
,
'memory_percent'
,
'name'
],
ad_value
=
''
))
if
procstat
[
'cpu_percent'
]
==
''
or
procstat
[
'memory_percent'
]
==
''
:
# Do not display process if we can not get the basic cpu_percent or memory_percent stats
return
None
# Process command line (cached with internal cache)
try
:
...
...
glances/core/glances_standalone.py
浏览文件 @
b93a5134
...
...
@@ -34,8 +34,8 @@ class GlancesStandalone(object):
# Init stats
self
.
stats
=
GlancesStats
(
config
=
config
,
args
=
args
)
# Default number of processes to displayed is set to
2
0
glances_processes
.
set_max_processes
(
2
0
)
# Default number of processes to displayed is set to
5
0
glances_processes
.
set_max_processes
(
5
0
)
# If process extended stats is disabled by user
if
args
.
disable_process_extended
:
...
...
glances/plugins/glances_processlist.py
浏览文件 @
b93a5134
...
...
@@ -261,8 +261,7 @@ class Plugin(GlancesPlugin):
msg
+=
_
(
'swap '
)
+
self
.
auto_unit
(
p
[
'memory_swap'
],
low_precision
=
False
)
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
# Third line is for openned files/network sessions
ret
.
append
(
self
.
curse_new_line
())
msg
=
xpad
+
_
(
'Openned: '
)
msg
=
''
if
'num_threads'
in
p
and
p
[
'num_threads'
]
is
not
None
:
msg
+=
_
(
'threads '
)
+
str
(
p
[
'num_threads'
])
+
' '
if
'num_fds'
in
p
and
p
[
'num_fds'
]
is
not
None
:
...
...
@@ -273,7 +272,10 @@ class Plugin(GlancesPlugin):
msg
+=
_
(
'TCP '
)
+
str
(
p
[
'tcp'
])
+
' '
if
'udp'
in
p
and
p
[
'udp'
]
is
not
None
:
msg
+=
_
(
'UDP '
)
+
str
(
p
[
'udp'
])
+
' '
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
if
msg
!=
''
:
ret
.
append
(
self
.
curse_new_line
())
msg
=
xpad
+
_
(
'Openned: '
)
+
msg
ret
.
append
(
self
.
curse_add_line
(
msg
,
splittable
=
True
))
# Fouth line is IO nice level (only Linux and Windows OS)
if
'ionice'
in
p
and
p
[
'ionice'
]
is
not
None
:
ret
.
append
(
self
.
curse_new_line
())
...
...
man/glances.1
浏览文件 @
b93a5134
.TH glances 1 "October, 2014" "version 2.1.
1
" "USER COMMANDS"
.TH glances 1 "October, 2014" "version 2.1.
2
" "USER COMMANDS"
.SH NAME
glances \- A cross-platform curses-based system monitoring tool
.SH SYNOPSIS
...
...
setup.py
浏览文件 @
b93a5134
...
...
@@ -40,7 +40,7 @@ def get_requires():
setup
(
name
=
'Glances'
,
version
=
'2.1.
1
'
,
version
=
'2.1.
2
'
,
description
=
"A cross-platform curses-based monitoring tool"
,
long_description
=
open
(
'README.rst'
).
read
(),
author
=
'Nicolas Hennion'
,
...
...
tox.ini
0 → 100644
浏览文件 @
b93a5134
# Tox (http://tox.testrun.org/) is a tool for running tests
# Install:
# pip install tox
# Run:
# tox
[tox]
envlist
=
py27, py34
[testenv]
deps
=
flake8
requests
psutil
bottle
batinfo
https://bitbucket.org/gleb_zhulik/py3sensors/get/tip.tar.gz
commands
=
python
unitest.py
python
unitest-restful.py
python
unitest-xmlrpc.py
#flake8 --exclude=build,.tox,.git
unitest-restful.py
浏览文件 @
b93a5134
...
...
@@ -123,7 +123,7 @@ class TestGlances(unittest.TestCase):
plist
=
requests
.
get
(
"%s/%s"
%
(
URL
,
method
))
print
plist
.
json
(
)
print
(
plist
.
json
()
)
for
p
in
plist
.
json
():
print
(
"HTTP RESTFul request: %s/%s"
%
(
URL
,
p
))
...
...
unitest-xmlrpc.py
浏览文件 @
b93a5134
...
...
@@ -27,9 +27,13 @@ import time
import
unittest
import
shlex
import
subprocess
import
xmlrpclib
import
json
import
types
try
:
from
xmlrpc.client
import
ServerProxy
except
ImportError
:
# Python 2
from
xmlrpclib
import
ServerProxy
from
glances.core.glances_globals
import
(
appname
,
...
...
@@ -68,7 +72,7 @@ from glances.core.glances_stats import GlancesStats
stats
=
GlancesStats
()
# Init the XML/RCP client
client
=
xmlrpclib
.
ServerProxy
(
URL
)
client
=
ServerProxy
(
URL
)
# Unitest class
# ==============
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录