Unverified Commit d6324535 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #574 from XuPeng-SH/track_0.6.0 

[skip ci](shards): remove color decorator in log file, fixes #573
parents c3c0d239 d98e673f

shards/mishards/service_handler.py

+6 −9
Original line number Diff line number Diff line
@@ -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'],

                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

                    )

                                                   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

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ class TracingConfig: 
        }

    }



    max_overflow=0



class DefaultConfig:

    SQLALCHEMY_DATABASE_URI = env.str('SQLALCHEMY_DATABASE_URI')

shards/utils/logger_helper.py

+19 −11
Original line number Diff line number Diff line 
import os

import datetime

import copy

from pytz import timezone

from logging import Filter

import logging.config
@@ -63,20 +64,27 @@ class ColorFulFormatColMixin: 
        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

shards/utils/colors.py

+57 −57

File changed.

Contains only whitespace changes.