Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
d98e673f
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d98e673f
编写于
11月 27, 2019
作者:
P
peng.xu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[skip ci](shards): remove color decorator in log file, fixes #573
上级
7f3b5258
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
82 addition
and
78 deletion
+82
-78
shards/mishards/service_handler.py
shards/mishards/service_handler.py
+6
-9
shards/mishards/settings.py
shards/mishards/settings.py
+0
-1
shards/utils/colors.py
shards/utils/colors.py
+57
-57
shards/utils/logger_helper.py
shards/utils/logger_helper.py
+19
-11
未找到文件。
shards/mishards/service_handler.py
浏览文件 @
d98e673f
...
...
@@ -140,15 +140,12 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
with
self
.
tracer
.
start_span
(
'search_{}'
.
format
(
addr
),
child_of
=
span
):
ret
=
conn
.
search_vectors_in_files
(
table_name
=
query_params
[
'table_id'
],
file_ids
=
query_params
[
'file_ids'
],
query_records
=
vectors
,
top_k
=
topk
,
nprobe
=
nprobe
)
ret
=
conn
.
search_vectors_in_files
(
table_name
=
query_params
[
'table_id'
],
file_ids
=
query_params
[
'file_ids'
],
query_records
=
vectors
,
top_k
=
topk
,
nprobe
=
nprobe
)
end
=
time
.
time
()
logger
.
info
(
'search_vectors_in_files takes: {}'
.
format
(
end
-
start
))
all_topk_results
.
append
(
ret
)
...
...
@@ -321,7 +318,7 @@ class ServiceHandler(milvus_pb2_grpc.MilvusServiceServicer):
metadata
=
metadata
)
now
=
time
.
time
()
logger
.
info
(
'SearchVector takes: {}'
.
format
(
now
-
start
))
#
logger.info('SearchVector takes: {}'.format(now - start))
topk_result_list
=
milvus_pb2
.
TopKQueryResult
(
status
=
status_pb2
.
Status
(
error_code
=
status
.
error_code
,
...
...
shards/mishards/settings.py
浏览文件 @
d98e673f
...
...
@@ -50,7 +50,6 @@ class TracingConfig:
}
}
max_overflow
=
0
class
DefaultConfig
:
SQLALCHEMY_DATABASE_URI
=
env
.
str
(
'SQLALCHEMY_DATABASE_URI'
)
...
...
shards/utils/colors.py
浏览文件 @
d98e673f
# Reset
Color_Off
=
'
\033
[0m'
# Text Reset
Color_Off
=
'
\033
[0m'
# Text Reset
# Regular Colors
Black
=
'
\033
[0;30m'
# Black
Red
=
'
\033
[0;31m'
# Red
Green
=
'
\033
[0;32m'
# Green
Yellow
=
'
\033
[0;33m'
# Yellow
Blue
=
'
\033
[0;34m'
# Blue
Purple
=
'
\033
[0;35m'
# Purple
Cyan
=
'
\033
[0;36m'
# Cyan
White
=
'
\033
[0;37m'
# White
Black
=
'
\033
[0;30m'
# Black
Red
=
'
\033
[0;31m'
# Red
Green
=
'
\033
[0;32m'
# Green
Yellow
=
'
\033
[0;33m'
# Yellow
Blue
=
'
\033
[0;34m'
# Blue
Purple
=
'
\033
[0;35m'
# Purple
Cyan
=
'
\033
[0;36m'
# Cyan
White
=
'
\033
[0;37m'
# White
# Bold
BBlack
=
'
\033
[1;30m'
# Black
BRed
=
'
\033
[1;31m'
# Red
BGreen
=
'
\033
[1;32m'
# Green
BYellow
=
'
\033
[1;33m'
# Yellow
BBlue
=
'
\033
[1;34m'
# Blue
BPurple
=
'
\033
[1;35m'
# Purple
BCyan
=
'
\033
[1;36m'
# Cyan
BWhite
=
'
\033
[1;37m'
# White
BBlack
=
'
\033
[1;30m'
# Black
BRed
=
'
\033
[1;31m'
# Red
BGreen
=
'
\033
[1;32m'
# Green
BYellow
=
'
\033
[1;33m'
# Yellow
BBlue
=
'
\033
[1;34m'
# Blue
BPurple
=
'
\033
[1;35m'
# Purple
BCyan
=
'
\033
[1;36m'
# Cyan
BWhite
=
'
\033
[1;37m'
# White
# Underline
UBlack
=
'
\033
[4;30m'
# Black
URed
=
'
\033
[4;31m'
# Red
UGreen
=
'
\033
[4;32m'
# Green
UYellow
=
'
\033
[4;33m'
# Yellow
UBlue
=
'
\033
[4;34m'
# Blue
UPurple
=
'
\033
[4;35m'
# Purple
UCyan
=
'
\033
[4;36m'
# Cyan
UWhite
=
'
\033
[4;37m'
# White
UBlack
=
'
\033
[4;30m'
# Black
URed
=
'
\033
[4;31m'
# Red
UGreen
=
'
\033
[4;32m'
# Green
UYellow
=
'
\033
[4;33m'
# Yellow
UBlue
=
'
\033
[4;34m'
# Blue
UPurple
=
'
\033
[4;35m'
# Purple
UCyan
=
'
\033
[4;36m'
# Cyan
UWhite
=
'
\033
[4;37m'
# White
# Background
On_Black
=
'
\033
[40m'
# Black
On_Red
=
'
\033
[41m'
# Red
On_Green
=
'
\033
[42m'
# Green
On_Yellow
=
'
\033
[43m'
# Yellow
On_Blue
=
'
\033
[44m'
# Blue
On_Purple
=
'
\033
[45m'
# Purple
On_Cyan
=
'
\033
[46m'
# Cyan
On_White
=
'
\033
[47m'
# White
On_Black
=
'
\033
[40m'
# Black
On_Red
=
'
\033
[41m'
# Red
On_Green
=
'
\033
[42m'
# Green
On_Yellow
=
'
\033
[43m'
# Yellow
On_Blue
=
'
\033
[44m'
# Blue
On_Purple
=
'
\033
[45m'
# Purple
On_Cyan
=
'
\033
[46m'
# Cyan
On_White
=
'
\033
[47m'
# White
# High Intensity
IBlack
=
'
\033
[0;90m'
# Black
IRed
=
'
\033
[0;91m'
# Red
IGreen
=
'
\033
[0;92m'
# Green
IYellow
=
'
\033
[0;93m'
# Yellow
IBlue
=
'
\033
[0;94m'
# Blue
IPurple
=
'
\033
[0;95m'
# Purple
ICyan
=
'
\033
[0;96m'
# Cyan
IWhite
=
'
\033
[0;97m'
# White
IBlack
=
'
\033
[0;90m'
# Black
IRed
=
'
\033
[0;91m'
# Red
IGreen
=
'
\033
[0;92m'
# Green
IYellow
=
'
\033
[0;93m'
# Yellow
IBlue
=
'
\033
[0;94m'
# Blue
IPurple
=
'
\033
[0;95m'
# Purple
ICyan
=
'
\033
[0;96m'
# Cyan
IWhite
=
'
\033
[0;97m'
# White
# Bold High Intensity
BIBlack
=
'
\033
[1;90m'
# Black
BIRed
=
'
\033
[1;91m'
# Red
BIGreen
=
'
\033
[1;92m'
# Green
BIYellow
=
'
\033
[1;93m'
# Yellow
BIBlue
=
'
\033
[1;94m'
# Blue
BIPurple
=
'
\033
[1;95m'
# Purple
BICyan
=
'
\033
[1;96m'
# Cyan
BIWhite
=
'
\033
[1;97m'
# White
BIBlack
=
'
\033
[1;90m'
# Black
BIRed
=
'
\033
[1;91m'
# Red
BIGreen
=
'
\033
[1;92m'
# Green
BIYellow
=
'
\033
[1;93m'
# Yellow
BIBlue
=
'
\033
[1;94m'
# Blue
BIPurple
=
'
\033
[1;95m'
# Purple
BICyan
=
'
\033
[1;96m'
# Cyan
BIWhite
=
'
\033
[1;97m'
# White
# High Intensity backgrounds
On_IBlack
=
'
\033
[0;100m'
# Black
On_IRed
=
'
\033
[0;101m'
# Red
On_IGreen
=
'
\033
[0;102m'
# Green
On_IYellow
=
'
\033
[0;103m'
# Yellow
On_IBlue
=
'
\033
[0;104m'
# Blue
On_IPurple
=
'
\033
[0;105m'
# Purple
On_ICyan
=
'
\033
[0;106m'
# Cyan
On_IWhite
=
'
\033
[0;107m'
# White
On_IBlack
=
'
\033
[0;100m'
# Black
On_IRed
=
'
\033
[0;101m'
# Red
On_IGreen
=
'
\033
[0;102m'
# Green
On_IYellow
=
'
\033
[0;103m'
# Yellow
On_IBlue
=
'
\033
[0;104m'
# Blue
On_IPurple
=
'
\033
[0;105m'
# Purple
On_ICyan
=
'
\033
[0;106m'
# Cyan
On_IWhite
=
'
\033
[0;107m'
# White
shards/utils/logger_helper.py
浏览文件 @
d98e673f
import
os
import
datetime
import
copy
from
pytz
import
timezone
from
logging
import
Filter
import
logging.config
...
...
@@ -59,24 +60,31 @@ class ColorFulFormatColMixin:
return
message_str
def
formatTime
(
self
,
record
,
datefmt
=
None
):
ret
=
super
().
formatTime
(
record
,
datefmt
)
ret
=
super
().
formatTime
(
record
,
datefmt
)
ret
=
COLORS
[
'ASCTIME'
]
+
ret
+
COLORS
[
'ENDC'
]
return
ret
def
format_record
(
self
,
record
):
msg_schema
=
record
.
levelname
+
'M'
record
.
msg
=
'{}{}{}'
.
format
(
COLORS
[
msg_schema
],
record
.
msg
,
COLORS
[
'ENDC'
])
record
.
filename
=
COLORS
[
'FILENAME'
]
+
record
.
filename
+
COLORS
[
'ENDC'
]
record
.
lineno
=
'{}{}{}'
.
format
(
COLORS
[
'LINENO'
],
record
.
lineno
,
COLORS
[
'ENDC'
])
record
.
threadName
=
'{}{}{}'
.
format
(
COLORS
[
'THREAD'
],
record
.
threadName
,
COLORS
[
'ENDC'
])
record
.
levelname
=
COLORS
[
record
.
levelname
]
+
record
.
levelname
+
COLORS
[
'ENDC'
]
return
record
class
ColorfulLogRecordProxy
(
logging
.
LogRecord
):
def
__init__
(
self
,
record
):
self
.
_record
=
record
msg_level
=
record
.
levelname
+
'M'
self
.
msg
=
'{}{}{}'
.
format
(
COLORS
[
msg_level
],
record
.
msg
,
COLORS
[
'ENDC'
])
self
.
filename
=
COLORS
[
'FILENAME'
]
+
record
.
filename
+
COLORS
[
'ENDC'
]
self
.
lineno
=
'{}{}{}'
.
format
(
COLORS
[
'LINENO'
],
record
.
lineno
,
COLORS
[
'ENDC'
])
self
.
threadName
=
'{}{}{}'
.
format
(
COLORS
[
'THREAD'
],
record
.
threadName
,
COLORS
[
'ENDC'
])
self
.
levelname
=
COLORS
[
record
.
levelname
]
+
record
.
levelname
+
COLORS
[
'ENDC'
]
def
__getattr__
(
self
,
attr
):
if
attr
not
in
self
.
__dict__
:
return
getattr
(
self
.
_record
,
attr
)
return
getattr
(
self
,
attr
)
class
ColorfulFormatter
(
ColorFulFormatColMixin
,
logging
.
Formatter
):
def
format
(
self
,
record
):
record
=
self
.
format_record
(
record
)
message_str
=
super
(
ColorfulFormatter
,
self
).
format
(
record
)
proxy
=
ColorfulLogRecordProxy
(
record
)
message_str
=
super
(
).
format
(
proxy
)
return
message_str
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录