Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleHub
提交
edaa0663
P
PaddleHub
项目概览
PaddlePaddle
/
PaddleHub
接近 2 年 前同步成功
通知
284
Star
12117
Fork
2091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
200
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
200
Issue
200
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
edaa0663
编写于
10月 21, 2020
作者:
W
wuzewu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add exception logging mechanism
上级
6fe29659
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
41 addition
and
8 deletion
+41
-8
paddlehub/env.py
paddlehub/env.py
+1
-0
paddlehub/module/manager.py
paddlehub/module/manager.py
+13
-4
paddlehub/server/git_source.py
paddlehub/server/git_source.py
+14
-4
paddlehub/utils/utils.py
paddlehub/utils/utils.py
+13
-0
未找到文件。
paddlehub/env.py
浏览文件 @
edaa0663
...
@@ -52,3 +52,4 @@ CONF_HOME = _get_sub_home('conf')
...
@@ -52,3 +52,4 @@ CONF_HOME = _get_sub_home('conf')
THIRD_PARTY_HOME
=
_get_sub_home
(
'thirdparty'
)
THIRD_PARTY_HOME
=
_get_sub_home
(
'thirdparty'
)
TMP_HOME
=
_get_sub_home
(
'tmp'
)
TMP_HOME
=
_get_sub_home
(
'tmp'
)
SOURCES_HOME
=
_get_sub_home
(
'sources'
)
SOURCES_HOME
=
_get_sub_home
(
'sources'
)
LOG_HOME
=
_get_sub_home
(
'log'
)
paddlehub/module/manager.py
浏览文件 @
edaa0663
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
import
os
import
os
import
shutil
import
shutil
import
sys
import
sys
import
traceback
from
collections
import
OrderedDict
from
collections
import
OrderedDict
from
typing
import
List
from
typing
import
List
...
@@ -216,8 +217,12 @@ class LocalModuleManager(object):
...
@@ -216,8 +217,12 @@ class LocalModuleManager(object):
if
os
.
path
.
exists
(
module_dir
):
if
os
.
path
.
exists
(
module_dir
):
try
:
try
:
module
=
self
.
_local_modules
[
name
]
=
HubModule
.
load
(
module_dir
)
module
=
self
.
_local_modules
[
name
]
=
HubModule
.
load
(
module_dir
)
except
:
except
Exception
as
e
:
log
.
logger
.
warning
(
'An error was encountered while loading {}'
.
format
(
name
))
msg
=
traceback
.
format_exc
()
file
=
utils
.
record
(
msg
)
log
.
logger
.
warning
(
'An error was encountered while loading {}. Detailed error information can be found in the {}.'
.
format
(
name
,
file
))
if
not
module
:
if
not
module
:
return
None
return
None
...
@@ -236,8 +241,12 @@ class LocalModuleManager(object):
...
@@ -236,8 +241,12 @@ class LocalModuleManager(object):
fulldir
=
os
.
path
.
join
(
self
.
home
,
subdir
)
fulldir
=
os
.
path
.
join
(
self
.
home
,
subdir
)
try
:
try
:
self
.
_local_modules
[
subdir
]
=
HubModule
.
load
(
fulldir
)
self
.
_local_modules
[
subdir
]
=
HubModule
.
load
(
fulldir
)
except
:
except
Exception
as
e
:
log
.
logger
.
warning
(
'An error was encountered while loading {}'
.
format
(
subdir
))
msg
=
traceback
.
format_exc
()
file
=
utils
.
record
(
msg
)
log
.
logger
.
warning
(
'An error was encountered while loading {}. Detailed error information can be found in the {}.'
.
format
(
subdir
,
file
))
return
[
module
for
module
in
self
.
_local_modules
.
values
()]
return
[
module
for
module
in
self
.
_local_modules
.
values
()]
...
...
paddlehub/server/git_source.py
浏览文件 @
edaa0663
...
@@ -17,6 +17,7 @@ import inspect
...
@@ -17,6 +17,7 @@ import inspect
import
importlib
import
importlib
import
os
import
os
import
sys
import
sys
import
traceback
from
collections
import
OrderedDict
from
collections
import
OrderedDict
from
typing
import
List
from
typing
import
List
...
@@ -67,8 +68,13 @@ class GitSource(object):
...
@@ -67,8 +68,13 @@ class GitSource(object):
self
.
repo
.
remote
().
pull
(
self
.
repo
.
branches
[
0
])
self
.
repo
.
remote
().
pull
(
self
.
repo
.
branches
[
0
])
# reload modules
# reload modules
self
.
load_hub_modules
()
self
.
load_hub_modules
()
except
:
except
Exception
as
e
:
log
.
logger
.
warning
(
'An error occurred while update {}'
.
format
(
self
.
path
))
self
.
hub_modules
=
OrderedDict
()
msg
=
traceback
.
format_exc
()
file
=
utils
.
record
(
msg
)
log
.
logger
.
warning
(
'An error occurred while update {}. Detailed error information can be found in the {}.'
.
format
(
self
.
path
,
file
))
def
load_hub_modules
(
self
):
def
load_hub_modules
(
self
):
if
'hubconf'
in
sys
.
modules
:
if
'hubconf'
in
sys
.
modules
:
...
@@ -81,9 +87,13 @@ class GitSource(object):
...
@@ -81,9 +87,13 @@ class GitSource(object):
_item
=
py_module
.
__dict__
[
_item
]
_item
=
py_module
.
__dict__
[
_item
]
if
issubclass
(
_item
,
RunModule
):
if
issubclass
(
_item
,
RunModule
):
self
.
hub_modules
[
_item
.
name
]
=
_item
self
.
hub_modules
[
_item
.
name
]
=
_item
except
:
except
Exception
as
e
:
self
.
hub_modules
=
OrderedDict
()
self
.
hub_modules
=
OrderedDict
()
log
.
logger
.
warning
(
'An error occurred while loading {}'
.
format
(
self
.
path
))
msg
=
traceback
.
format_exc
()
file
=
utils
.
record
(
msg
)
log
.
logger
.
warning
(
'An error occurred while loading {}. Detailed error information can be found in the {}.'
.
format
(
self
.
path
,
file
))
sys
.
path
.
remove
(
self
.
path
)
sys
.
path
.
remove
(
self
.
path
)
...
...
paddlehub/utils/utils.py
浏览文件 @
edaa0663
...
@@ -281,3 +281,16 @@ def md5(text: str):
...
@@ -281,3 +281,16 @@ def md5(text: str):
'''
'''
md5code
=
hashlib
.
md5
(
text
.
encode
())
md5code
=
hashlib
.
md5
(
text
.
encode
())
return
md5code
.
hexdigest
()
return
md5code
.
hexdigest
()
def
record
(
msg
:
str
)
->
str
:
'''
'''
logfile
=
os
.
path
.
join
(
hubenv
.
LOG_HOME
,
time
.
strftime
(
'%Y%m%d.log'
))
with
open
(
logfile
,
'a'
)
as
file
:
file
.
write
(
'='
*
50
+
'
\n
'
)
file
.
write
(
'Record at '
+
time
.
strftime
(
'%Y-%m-%d %H:%M:%S'
)
+
'
\n
'
)
file
.
write
(
'='
*
50
+
'
\n
'
)
file
.
write
(
str
(
msg
)
+
'
\n
'
*
3
)
return
logfile
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录