Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
1089b742
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,发现更多精彩内容 >>
提交
1089b742
编写于
1月 12, 2013
作者:
N
Nicolas Hennion
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #162 from asergi/master
Change default config file path
上级
bfbc1b76
28c893a8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
25 deletion
+28
-25
glances/glances.py
glances/glances.py
+5
-4
setup.py
setup.py
+23
-21
未找到文件。
glances/glances.py
浏览文件 @
1089b742
...
...
@@ -182,7 +182,8 @@ else:
csv_lib_tag
=
True
# Define the default configuration file
default_conf_file
=
"/etc/glances.conf"
DEFAULT_CONF_FILE
=
"/etc/glances/glances.conf"
# Classes
#========
...
...
@@ -228,7 +229,7 @@ class glancesLimits:
'PROCESS_CPU'
:
[
50
,
70
,
90
],
'PROCESS_MEM'
:
[
50
,
70
,
90
]}
def
__init__
(
self
,
conf_file
=
default_conf_file
):
def
__init__
(
self
,
conf_file
=
DEFAULT_CONF_FILE
):
# Open the configuration file
config
=
ConfigParser
.
RawConfigParser
()
if
(
config
.
read
(
conf_file
)
!=
[]):
...
...
@@ -3297,7 +3298,7 @@ def printSyntax():
print
(
_
(
"
\t
-B @IP|host
\t
Bind server to the given IP or host NAME"
))
print
(
_
(
"
\t
-c @IP|host
\t
Connect to a Glances server"
))
print
(
_
(
"
\t
-C file
\t\t
Path to the configuration file (default: %s)"
)
%
default_conf_file
)
DEFAULT_CONF_FILE
)
print
(
_
(
"
\t
-d
\t\t
Disable disk I/O module"
))
print
(
_
(
"
\t
-e
\t\t
Enable the sensors module (Linux-only)"
))
print
(
_
(
"
\t
-f file
\t\t
Set the output folder (HTML) or file (CSV)"
))
...
...
@@ -3362,7 +3363,7 @@ def main():
server_tag
=
False
# Default configuration file (if exist)
conf_file
=
default_conf_file
conf_file
=
DEFAULT_CONF_FILE
# Set the default refresh time
refresh_time
=
3
...
...
setup.py
浏览文件 @
1089b742
...
...
@@ -12,10 +12,10 @@ data_files = [
'COPYING'
,
'AUTHORS'
,
'NEWS'
,
'screenshot.png'
]),
'screenshot.png'
,
'glances/conf/glances.conf'
]),
(
'share/doc/glances/doc'
,
glob
(
'doc/*.png'
)),
(
'/etc'
,
[
'glances/conf/glances.conf'
]),
(
'share/glances/conf-default'
,
[
'glances/conf/glances.conf'
]),
(
'etc/glances'
,
[
'glances/conf/glances.conf'
]),
(
'share/glances/html'
,
glob
(
'glances/html/*.html'
)),
(
'share/glances/css'
,
glob
(
'glances/css/*.css'
)),
(
'share/glances/img'
,
glob
(
'glances/img/*.png'
)),
...
...
@@ -24,22 +24,24 @@ data_files = [
for
mo
in
glob
(
'i18n/*/LC_MESSAGES/*.mo'
):
data_files
.
append
((
dirname
(
mo
).
replace
(
'i18n/'
,
'share/locale/'
),
[
mo
]))
setup
(
name
=
'Glances'
,
version
=
'1.6b'
,
download_url
=
'https://s3.amazonaws.com/glances/glances-1.6b.tar.gz'
,
url
=
'https://github.com/nicolargo/glances'
,
description
=
'CLI curses-based monitoring tool'
,
author
=
'Nicolas Hennion'
,
author_email
=
'nicolas@nicolargo.com'
,
license
=
"LGPL"
,
keywords
=
"cli curses monitoring system"
,
long_description
=
open
(
'README'
).
read
(),
install_requires
=
[
'psutil>=0.4.1'
],
packages
=
[
'glances'
],
extras_require
=
{
'HTML'
:
[
'jinja2>=2.0'
],
'SENSORS'
:
[
'pysensors>=0.0.2'
],},
include_package_data
=
True
,
data_files
=
data_files
,
entry_points
=
{
"console_scripts"
:
[
"glances = glances.glances:main"
]},
setup
(
name
=
'Glances'
,
version
=
'1.6b'
,
download_url
=
'https://s3.amazonaws.com/glances/glances-1.6b.tar.gz'
,
url
=
'https://github.com/nicolargo/glances'
,
description
=
'CLI curses-based monitoring tool'
,
author
=
'Nicolas Hennion'
,
author_email
=
'nicolas@nicolargo.com'
,
license
=
"LGPL"
,
keywords
=
"cli curses monitoring system"
,
long_description
=
open
(
'README'
).
read
(),
install_requires
=
[
'psutil>=0.4.1'
],
packages
=
[
'glances'
],
extras_require
=
{
'HTML'
:
[
'jinja2>=2.0'
],
'SENSORS'
:
[
'pysensors>=0.0.2'
],
},
include_package_data
=
True
,
data_files
=
data_files
,
entry_points
=
{
"console_scripts"
:
[
"glances=glances.glances:main"
]},
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录