Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
64b73339
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 搜索 >>
提交
64b73339
编写于
12月 16, 2014
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix cyclic import (again)
glances_globals <-> glances_logging
上级
e54c3a7d
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
40 addition
and
38 deletion
+40
-38
glances/__init__.py
glances/__init__.py
+2
-1
glances/core/glances_autodiscover.py
glances/core/glances_autodiscover.py
+2
-1
glances/core/glances_client.py
glances/core/glances_client.py
+2
-1
glances/core/glances_client_browser.py
glances/core/glances_client_browser.py
+2
-2
glances/core/glances_config.py
glances/core/glances_config.py
+1
-1
glances/core/glances_globals.py
glances/core/glances_globals.py
+0
-5
glances/core/glances_logging.py
glances/core/glances_logging.py
+2
-0
glances/core/glances_main.py
glances/core/glances_main.py
+2
-1
glances/core/glances_monitor_list.py
glances/core/glances_monitor_list.py
+1
-1
glances/core/glances_password.py
glances/core/glances_password.py
+2
-8
glances/core/glances_processes.py
glances/core/glances_processes.py
+2
-1
glances/core/glances_server.py
glances/core/glances_server.py
+3
-2
glances/core/glances_snmp.py
glances/core/glances_snmp.py
+1
-1
glances/core/glances_standalone.py
glances/core/glances_standalone.py
+2
-1
glances/core/glances_staticlist.py
glances/core/glances_staticlist.py
+1
-1
glances/core/glances_stats.py
glances/core/glances_stats.py
+2
-1
glances/outputs/glances_bottle.py
glances/outputs/glances_bottle.py
+1
-2
glances/outputs/glances_colorconsole.py
glances/outputs/glances_colorconsole.py
+1
-1
glances/outputs/glances_csv.py
glances/outputs/glances_csv.py
+2
-1
glances/outputs/glances_curses.py
glances/outputs/glances_curses.py
+2
-1
glances/outputs/glances_history.py
glances/outputs/glances_history.py
+1
-1
glances/plugins/glances_batpercent.py
glances/plugins/glances_batpercent.py
+1
-1
glances/plugins/glances_monitor.py
glances/plugins/glances_monitor.py
+1
-1
glances/plugins/glances_plugin.py
glances/plugins/glances_plugin.py
+2
-1
glances/plugins/glances_sensors.py
glances/plugins/glances_sensors.py
+2
-1
未找到文件。
glances/__init__.py
浏览文件 @
64b73339
...
...
@@ -40,7 +40,8 @@ except ImportError:
# Import Glances libs
# Note: others Glances libs will be imported optionally
from
glances.core.glances_globals
import
gettext_domain
,
locale_dir
,
logger
from
glances.core.glances_globals
import
gettext_domain
,
locale_dir
from
glances.core.glances_logging
import
logger
from
glances.core.glances_main
import
GlancesMain
# Get PSutil version
...
...
glances/core/glances_autodiscover.py
浏览文件 @
64b73339
...
...
@@ -39,7 +39,8 @@ except ImportError:
zeroconf_tag
=
False
# Import Glances libs
from
glances.core.glances_globals
import
appname
,
logger
from
glances.core.glances_globals
import
appname
from
glances.core.glances_logging
import
logger
# Zeroconf 0.16 or higher is needed
if
zeroconf_tag
:
...
...
glances/core/glances_client.py
浏览文件 @
64b73339
...
...
@@ -35,7 +35,8 @@ except ImportError:
import
httplib
# Import Glances libs
from
glances.core.glances_globals
import
logger
,
version
from
glances.core.glances_globals
import
version
from
glances.core.glances_logging
import
logger
from
glances.core.glances_stats
import
GlancesStatsClient
from
glances.outputs.glances_curses
import
GlancesCursesClient
...
...
glances/core/glances_client_browser.py
浏览文件 @
64b73339
...
...
@@ -29,11 +29,11 @@ except ImportError:
from
xmlrpclib
import
ServerProxy
,
Fault
,
ProtocolError
# Import Glances libs
from
glances.core.glances_globals
import
logger
from
glances.outputs.glances_curses
import
GlancesCursesBrowser
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverServer
from
glances.core.glances_client
import
GlancesClient
,
GlancesClientTransport
from
glances.core.glances_logging
import
logger
from
glances.core.glances_staticlist
import
GlancesStaticServer
from
glances.outputs.glances_curses
import
GlancesCursesBrowser
class
GlancesClientBrowser
(
object
):
...
...
glances/core/glances_config.py
浏览文件 @
64b73339
...
...
@@ -37,10 +37,10 @@ from glances.core.glances_globals import (
is_mac
,
is_py3
,
is_windows
,
logger
,
sys_prefix
,
work_path
)
from
glances.core.glances_logging
import
logger
class
Config
(
object
):
...
...
glances/core/glances_globals.py
浏览文件 @
64b73339
...
...
@@ -22,8 +22,6 @@
import
os
import
sys
from
glances.core.glances_logging
import
glances_logger
# Global information
appname
=
'glances'
version
=
__import__
(
'glances'
).
__version__
...
...
@@ -61,6 +59,3 @@ i18n_path = os.path.realpath(os.path.join(work_path, '..', '..', 'i18n'))
user_i18n_path
=
os
.
path
.
join
(
os
.
path
.
expanduser
(
'~/.local'
),
'share'
,
'locale'
)
sys_i18n_path
=
os
.
path
.
join
(
sys_prefix
,
'share'
,
'locale'
)
locale_dir
=
get_locale_path
([
i18n_path
,
user_i18n_path
,
sys_i18n_path
])
# Create and init the logging instance
logger
=
glances_logger
()
glances/core/glances_logging.py
浏览文件 @
64b73339
...
...
@@ -82,3 +82,5 @@ def glances_logger():
level
=
logging
.
DEBUG
,
format
=
'%(asctime)s -- %(levelname)s -- %(message)s'
)
return
_logger
logger
=
glances_logger
()
glances/core/glances_main.py
浏览文件 @
64b73339
...
...
@@ -27,7 +27,8 @@ import tempfile
# Import Glances libs
from
glances.core.glances_config
import
Config
from
glances.core.glances_globals
import
appname
,
is_windows
,
logger
,
psutil_version
,
version
from
glances.core.glances_globals
import
appname
,
is_windows
,
psutil_version
,
version
from
glances.core.glances_logging
import
logger
class
GlancesMain
(
object
):
...
...
glances/core/glances_monitor_list.py
浏览文件 @
64b73339
...
...
@@ -24,7 +24,7 @@ import re
import
subprocess
# Import Glances lib
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
from
glances.core.glances_processes
import
glances_processes
...
...
glances/core/glances_password.py
浏览文件 @
64b73339
...
...
@@ -27,14 +27,8 @@ import sys
import
uuid
# Import Glances lib
from
glances.core.glances_globals
import
(
appname
,
is_bsd
,
is_linux
,
is_mac
,
is_windows
,
logger
)
from
glances.core.glances_globals
import
appname
,
is_bsd
,
is_linux
,
is_mac
,
is_windows
from
glances.core.glances_logging
import
logger
# Trick: bind raw_input to input in Python 2
try
:
...
...
glances/core/glances_processes.py
浏览文件 @
64b73339
...
...
@@ -27,7 +27,8 @@ import re
import
psutil
# Import Glances lib
from
glances.core.glances_globals
import
is_bsd
,
is_linux
,
is_mac
,
is_windows
,
logger
from
glances.core.glances_globals
import
is_bsd
,
is_linux
,
is_mac
,
is_windows
from
glances.core.glances_logging
import
logger
from
glances.core.glances_timer
import
getTimeSinceLastUpdate
,
Timer
...
...
glances/core/glances_server.py
浏览文件 @
64b73339
...
...
@@ -32,10 +32,11 @@ except ImportError: # Python 2
from
SimpleXMLRPCServer
import
SimpleXMLRPCServer
# Import Glances libs
from
glances.core.glances_globals
import
logger
,
version
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverClient
from
glances.core.glances_globals
import
version
from
glances.core.glances_logging
import
logger
from
glances.core.glances_stats
import
GlancesStatsServer
from
glances.core.glances_timer
import
Timer
from
glances.core.glances_autodiscover
import
GlancesAutoDiscoverClient
class
GlancesXMLRPCHandler
(
SimpleXMLRPCRequestHandler
):
...
...
glances/core/glances_snmp.py
浏览文件 @
64b73339
...
...
@@ -20,7 +20,7 @@
import
sys
# Import Glances libs
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
# Import mandatory PySNMP lib
try
:
...
...
glances/core/glances_standalone.py
浏览文件 @
64b73339
...
...
@@ -20,7 +20,8 @@
"""Manage the Glances standalone session."""
# Import Glances libs
from
glances.core.glances_globals
import
is_windows
,
logger
from
glances.core.glances_globals
import
is_windows
from
glances.core.glances_logging
import
logger
from
glances.core.glances_processes
import
glances_processes
from
glances.core.glances_stats
import
GlancesStats
from
glances.outputs.glances_curses
import
GlancesCursesStandalone
...
...
glances/core/glances_staticlist.py
浏览文件 @
64b73339
...
...
@@ -23,7 +23,7 @@
from
socket
import
gaierror
,
gethostbyname
# Import Glances libs
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
class
GlancesStaticServer
(
object
):
...
...
glances/core/glances_stats.py
浏览文件 @
64b73339
...
...
@@ -24,7 +24,8 @@ import os
import
re
import
sys
from
glances.core.glances_globals
import
logger
,
plugins_path
,
sys_path
from
glances.core.glances_globals
import
plugins_path
,
sys_path
from
glances.core.glances_logging
import
logger
# SNMP OID regexp pattern to short system name dict
oid_to_short_system_name
=
{
'.*Linux.*'
:
'linux'
,
...
...
glances/outputs/glances_bottle.py
浏览文件 @
64b73339
...
...
@@ -24,14 +24,13 @@ import os
import
sys
# Import Glances libs
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
# Import mandatory Bottle lib
try
:
from
bottle
import
Bottle
,
template
,
static_file
,
TEMPLATE_PATH
,
abort
,
response
except
ImportError
:
logger
.
critical
(
'Bottle module not found. Glances cannot start in web server mode.'
)
print
(
_
(
"Install it using pip: # pip install bottle"
))
sys
.
exit
(
2
)
...
...
glances/outputs/glances_colorconsole.py
浏览文件 @
64b73339
...
...
@@ -23,7 +23,7 @@ import time
import
msvcrt
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
try
:
import
colorconsole
...
...
glances/outputs/glances_csv.py
浏览文件 @
64b73339
...
...
@@ -24,7 +24,8 @@ import csv
import
sys
# Import Glances lib
from
glances.core.glances_globals
import
is_py3
,
logger
from
glances.core.glances_globals
import
is_py3
from
glances.core.glances_logging
import
logger
# List of stats enabled in the CSV output
csv_stats_list
=
[
'cpu'
,
'load'
,
'mem'
,
'memswap'
]
...
...
glances/outputs/glances_curses.py
浏览文件 @
64b73339
...
...
@@ -23,7 +23,8 @@
import
sys
# Import Glances lib
from
glances.core.glances_globals
import
is_mac
,
is_windows
,
logger
from
glances.core.glances_globals
import
is_mac
,
is_windows
from
glances.core.glances_logging
import
logger
from
glances.core.glances_logs
import
glances_logs
from
glances.core.glances_processes
import
glances_processes
from
glances.core.glances_timer
import
Timer
...
...
glances/outputs/glances_history.py
浏览文件 @
64b73339
...
...
@@ -23,7 +23,7 @@
import
os
# Import Glances lib
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
# Import specific lib
try
:
...
...
glances/plugins/glances_batpercent.py
浏览文件 @
64b73339
...
...
@@ -20,7 +20,7 @@
"""Battery plugin."""
# Import Glances libs
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
from
glances.plugins.glances_plugin
import
GlancesPlugin
# Batinfo library (optional; Linux-only)
...
...
glances/plugins/glances_monitor.py
浏览文件 @
64b73339
...
...
@@ -20,7 +20,7 @@
"""Monitor plugin."""
# Import Glances lib
from
glances.core.glances_
globals
import
logger
from
glances.core.glances_
logging
import
logger
from
glances.core.glances_monitor_list
import
MonitorList
as
glancesMonitorList
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
glances/plugins/glances_plugin.py
浏览文件 @
64b73339
...
...
@@ -29,7 +29,8 @@ from datetime import datetime
from
operator
import
itemgetter
# Import Glances lib
from
glances.core.glances_globals
import
is_py3
,
logger
from
glances.core.glances_globals
import
is_py3
from
glances.core.glances_logging
import
logger
from
glances.core.glances_logs
import
glances_logs
...
...
glances/plugins/glances_sensors.py
浏览文件 @
64b73339
...
...
@@ -27,7 +27,8 @@ except ImportError:
pass
# Import Glances lib
from
glances.core.glances_globals
import
is_py3
,
logger
from
glances.core.glances_globals
import
is_py3
from
glances.core.glances_logging
import
logger
from
glances.plugins.glances_batpercent
import
Plugin
as
BatPercentPlugin
from
glances.plugins.glances_hddtemp
import
Plugin
as
HddTempPlugin
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录