Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蜕变的菜鸟
glances
提交
a583aeb8
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 搜索 >>
提交
a583aeb8
编写于
3月 24, 2016
作者:
A
Alessio Sergi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove some duplicate variables from globals
Update all affected imports accordingly.
上级
84e8759a
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
39 addition
and
39 deletion
+39
-39
glances/__init__.py
glances/__init__.py
+4
-4
glances/autodiscover.py
glances/autodiscover.py
+3
-2
glances/client.py
glances/client.py
+3
-3
glances/config.py
glances/config.py
+8
-7
glances/globals.py
glances/globals.py
+0
-5
glances/main.py
glances/main.py
+5
-4
glances/password.py
glances/password.py
+3
-2
glances/plugins/glances_help.py
glances/plugins/glances_help.py
+2
-2
glances/plugins/glances_psutilversion.py
glances/plugins/glances_psutilversion.py
+2
-2
glances/server.py
glances/server.py
+2
-2
unitest-restful.py
unitest-restful.py
+2
-2
unitest-xmlrpc.py
unitest-xmlrpc.py
+2
-2
unitest.py
unitest.py
+3
-2
未找到文件。
glances/__init__.py
浏览文件 @
a583aeb8
...
...
@@ -33,7 +33,7 @@ __license__ = 'LGPL'
# Import psutil
try
:
from
psutil
import
__version__
as
__
psutil_version
from
psutil
import
__version__
as
psutil_version
except
ImportError
:
print
(
'PSutil library not found. Glances cannot start.'
)
sys
.
exit
(
1
)
...
...
@@ -62,8 +62,8 @@ if sys.version_info[:2] == (2, 6):
# Check PSutil version
psutil_min_version
=
(
2
,
0
,
0
)
psutil_version
=
tuple
([
int
(
num
)
for
num
in
__
psutil_version
.
split
(
'.'
)])
if
psutil_version
<
psutil_min_version
:
psutil_version
_info
=
tuple
([
int
(
num
)
for
num
in
psutil_version
.
split
(
'.'
)])
if
psutil_version
_info
<
psutil_min_version
:
print
(
'PSutil 2.0 or higher is needed. Glances cannot start.'
)
sys
.
exit
(
1
)
...
...
@@ -107,7 +107,7 @@ def main():
logger
.
info
(
'{0} {1} and PSutil {2} detected'
.
format
(
platform
.
python_implementation
(),
platform
.
python_version
(),
__
psutil_version
))
psutil_version
))
# Share global var
global
core
,
standalone
,
client
,
server
,
webserver
...
...
glances/autodiscover.py
浏览文件 @
a583aeb8
...
...
@@ -22,7 +22,8 @@
import
socket
import
sys
from
glances.globals
import
appname
,
BSD
from
glances
import
__appname__
from
glances.globals
import
BSD
from
glances.logger
import
logger
try
:
...
...
@@ -46,7 +47,7 @@ if zeroconf_tag:
sys
.
exit
(
1
)
# Global var
zeroconf_type
=
"_%s._tcp."
%
appname
zeroconf_type
=
"_%s._tcp."
%
__appname__
class
AutoDiscovered
(
object
):
...
...
glances/client.py
浏览文件 @
a583aeb8
...
...
@@ -23,8 +23,8 @@ import json
import
socket
import
sys
from
glances
import
__version__
from
glances.compat
import
Fault
,
ProtocolError
,
ServerProxy
,
Transport
from
glances.globals
import
version
from
glances.logger
import
logger
from
glances.stats_client
import
GlancesStatsClient
from
glances.outputs.glances_curses
import
GlancesCursesClient
...
...
@@ -122,11 +122,11 @@ class GlancesClient(object):
if
self
.
client_mode
==
'glances'
:
# Check that both client and server are in the same major version
if
version
.
split
(
'.'
)[
0
]
==
client_version
.
split
(
'.'
)[
0
]:
if
__version__
.
split
(
'.'
)[
0
]
==
client_version
.
split
(
'.'
)[
0
]:
# Init stats
self
.
stats
=
GlancesStatsClient
(
config
=
self
.
config
,
args
=
self
.
args
)
self
.
stats
.
set_plugins
(
json
.
loads
(
self
.
client
.
getAllPlugins
()))
logger
.
debug
(
"Client version: {0} / Server version: {1}"
.
format
(
version
,
client_version
))
logger
.
debug
(
"Client version: {0} / Server version: {1}"
.
format
(
__version__
,
client_version
))
else
:
self
.
log_and_exit
(
"Client and server not compatible:
\
Client version: {0} / Server version: {1}"
.
format
(
version
,
client_version
))
...
...
glances/config.py
浏览文件 @
a583aeb8
...
...
@@ -23,8 +23,9 @@ import os
import
sys
from
io
import
open
from
glances
import
__appname__
from
glances.compat
import
ConfigParser
,
NoOptionError
from
glances.globals
import
appname
,
BSD
,
LINUX
,
OSX
,
WINDOWS
,
sys_prefix
from
glances.globals
import
BSD
,
LINUX
,
OSX
,
WINDOWS
,
sys_prefix
from
glances.logger
import
logger
...
...
@@ -69,22 +70,22 @@ class Config(object):
paths
.
append
(
os
.
path
.
join
(
os
.
environ
.
get
(
'XDG_CONFIG_HOME'
)
or
os
.
path
.
expanduser
(
'~/.config'
),
appname
,
self
.
config_filename
))
__appname__
,
self
.
config_filename
))
if
BSD
:
paths
.
append
(
os
.
path
.
join
(
sys
.
prefix
,
'etc'
,
appname
,
self
.
config_filename
))
os
.
path
.
join
(
sys
.
prefix
,
'etc'
,
__appname__
,
self
.
config_filename
))
else
:
paths
.
append
(
os
.
path
.
join
(
'/etc'
,
appname
,
self
.
config_filename
))
os
.
path
.
join
(
'/etc'
,
__appname__
,
self
.
config_filename
))
elif
OSX
:
paths
.
append
(
os
.
path
.
join
(
os
.
path
.
expanduser
(
'~/Library/Application Support/'
),
appname
,
self
.
config_filename
))
__appname__
,
self
.
config_filename
))
paths
.
append
(
os
.
path
.
join
(
sys_prefix
,
'etc'
,
appname
,
self
.
config_filename
))
os
.
path
.
join
(
sys_prefix
,
'etc'
,
__appname__
,
self
.
config_filename
))
elif
WINDOWS
:
paths
.
append
(
os
.
path
.
join
(
os
.
environ
.
get
(
'APPDATA'
),
appname
,
self
.
config_filename
))
os
.
path
.
join
(
os
.
environ
.
get
(
'APPDATA'
),
__appname__
,
self
.
config_filename
))
return
paths
...
...
glances/globals.py
浏览文件 @
a583aeb8
...
...
@@ -22,11 +22,6 @@
import
os
import
sys
# Global information
appname
=
'glances'
version
=
__import__
(
'glances'
).
__version__
psutil_version
=
__import__
(
'glances'
).
__psutil_version
# Operating system flag
# Note: Somes libs depends of OS
BSD
=
sys
.
platform
.
find
(
'bsd'
)
!=
-
1
...
...
glances/main.py
浏览文件 @
a583aeb8
...
...
@@ -24,9 +24,10 @@ import os
import
sys
import
tempfile
from
glances
import
__appname__
,
__version__
,
psutil_version
from
glances.compat
import
input
from
glances.config
import
Config
from
glances.globals
import
appname
,
LINUX
,
WINDOWS
,
psutil_version
,
version
from
glances.globals
import
LINUX
,
WINDOWS
from
glances.logger
import
logger
...
...
@@ -86,14 +87,14 @@ Start the client browser (browser mode):\n\
def
init_args
(
self
):
"""Init all the command line arguments."""
_version
=
"Glances v"
+
version
+
" with psutil v"
+
psutil_version
version
=
"Glances v"
+
__version__
+
" with psutil v"
+
psutil_version
parser
=
argparse
.
ArgumentParser
(
prog
=
appname
,
prog
=
__appname__
,
conflict_handler
=
'resolve'
,
formatter_class
=
argparse
.
RawDescriptionHelpFormatter
,
epilog
=
self
.
example_of_use
)
parser
.
add_argument
(
'-V'
,
'--version'
,
action
=
'version'
,
version
=
_
version
)
'-V'
,
'--version'
,
action
=
'version'
,
version
=
version
)
parser
.
add_argument
(
'-d'
,
'--debug'
,
action
=
'store_true'
,
default
=
False
,
dest
=
'debug'
,
help
=
'enable debug mode'
)
parser
.
add_argument
(
'-C'
,
'--config'
,
dest
=
'conf_file'
,
...
...
glances/password.py
浏览文件 @
a583aeb8
...
...
@@ -26,8 +26,9 @@ import sys
import
uuid
from
io
import
open
from
glances
import
__appname__
from
glances.compat
import
b
,
input
from
glances.globals
import
appname
,
BSD
,
LINUX
,
OSX
,
WINDOWS
from
glances.globals
import
BSD
,
LINUX
,
OSX
,
WINDOWS
from
glances.logger
import
logger
...
...
@@ -58,7 +59,7 @@ class GlancesPassword(object):
app_path
=
'.'
# Append the Glances folder
app_path
=
os
.
path
.
join
(
app_path
,
appname
)
app_path
=
os
.
path
.
join
(
app_path
,
__appname__
)
return
app_path
...
...
glances/plugins/glances_help.py
浏览文件 @
a583aeb8
...
...
@@ -23,7 +23,7 @@ Help plugin.
Just a stupid plugin to display the help screen.
"""
from
glances
.globals
import
appname
,
psutil_version
,
version
from
glances
import
__appname__
,
__version__
,
psutil_
version
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
@@ -50,7 +50,7 @@ class Plugin(GlancesPlugin):
pass
def
generate_view_data
(
self
):
self
.
view_data
[
'version'
]
=
'{0} {1}'
.
format
(
appname
.
title
(),
version
)
self
.
view_data
[
'version'
]
=
'{0} {1}'
.
format
(
__appname__
.
title
(),
__version__
)
self
.
view_data
[
'psutil_version'
]
=
' with PSutil {0}'
.
format
(
psutil_version
)
try
:
...
...
glances/plugins/glances_psutilversion.py
浏览文件 @
a583aeb8
...
...
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from
glances
.globals
import
psutil_version
from
glances
import
psutil_version_info
from
glances.plugins.glances_plugin
import
GlancesPlugin
...
...
@@ -46,7 +46,7 @@ class Plugin(GlancesPlugin):
if
self
.
input_method
==
'local'
:
# PsUtil version only available in local
try
:
self
.
stats
=
tuple
([
int
(
num
)
for
num
in
psutil_version
.
split
(
'.'
)])
self
.
stats
=
psutil_version_info
except
NameError
:
pass
else
:
...
...
glances/server.py
浏览文件 @
a583aeb8
...
...
@@ -24,9 +24,9 @@ import socket
import
sys
from
base64
import
b64decode
from
glances
import
__version__
from
glances.compat
import
SimpleXMLRPCRequestHandler
,
SimpleXMLRPCServer
from
glances.autodiscover
import
GlancesAutoDiscoverClient
from
glances.globals
import
version
from
glances.logger
import
logger
from
glances.stats_server
import
GlancesStatsServer
from
glances.timer
import
Timer
...
...
@@ -137,7 +137,7 @@ class GlancesInstance(object):
def
init
(
self
):
# Return the Glances version
return
version
return
__version__
def
getAll
(
self
):
# Update and return all the stats
...
...
unitest-restful.py
浏览文件 @
a583aeb8
...
...
@@ -25,8 +25,8 @@ import subprocess
import
time
import
unittest
from
glances
import
__version__
from
glances.compat
import
text_type
from
glances.globals
import
version
import
requests
...
...
@@ -36,7 +36,7 @@ pid = None
# Unitest class
# ==============
print
(
'RESTful API unitary tests for Glances %s'
%
version
)
print
(
'RESTful API unitary tests for Glances %s'
%
__version__
)
class
TestGlances
(
unittest
.
TestCase
):
...
...
unitest-xmlrpc.py
浏览文件 @
a583aeb8
...
...
@@ -26,8 +26,8 @@ import subprocess
import
time
import
unittest
from
glances
import
__version__
from
glances.compat
import
ServerProxy
from
glances.globals
import
version
SERVER_PORT
=
61234
URL
=
"http://localhost:%s"
%
SERVER_PORT
...
...
@@ -38,7 +38,7 @@ client = ServerProxy(URL)
# Unitest class
# ==============
print
(
'XML-RPC API unitary tests for Glances %s'
%
version
)
print
(
'XML-RPC API unitary tests for Glances %s'
%
__version__
)
class
TestGlances
(
unittest
.
TestCase
):
...
...
unitest.py
浏览文件 @
a583aeb8
...
...
@@ -38,12 +38,13 @@ if not core.is_standalone():
from
glances.stats
import
GlancesStats
stats
=
GlancesStats
()
from
glances.globals
import
WINDOWS
,
version
from
glances
import
__version__
from
glances.globals
import
WINDOWS
from
glances.outputs.glances_bars
import
Bar
# Unitest class
# ==============
print
(
'Unitary tests for Glances %s'
%
version
)
print
(
'Unitary tests for Glances %s'
%
__version__
)
class
TestGlances
(
unittest
.
TestCase
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录