diff --git a/api/gen/go/conf/v1/kratos_conf_logger.pb.go b/api/gen/go/conf/v1/kratos_conf_logger.pb.go index 5f7aa14..145c033 100644 --- a/api/gen/go/conf/v1/kratos_conf_logger.pb.go +++ b/api/gen/go/conf/v1/kratos_conf_logger.pb.go @@ -191,6 +191,7 @@ type Logger_Logrus struct { TimestampFormat string `protobuf:"bytes,3,opt,name=timestamp_format,json=timestampFormat,proto3" json:"timestamp_format,omitempty"` // 定义时间戳格式,例如:"2006-01-02 15:04:05" DisableColors bool `protobuf:"varint,4,opt,name=disable_colors,json=disableColors,proto3" json:"disable_colors,omitempty"` // 不需要彩色日志 DisableTimestamp bool `protobuf:"varint,5,opt,name=disable_timestamp,json=disableTimestamp,proto3" json:"disable_timestamp,omitempty"` // 不需要时间戳 + ForceColors bool `protobuf:"varint,6,opt,name=force_colors,json=forceColors,proto3" json:"force_colors,omitempty"` // 是否开启彩色日志 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -260,6 +261,13 @@ func (x *Logger_Logrus) GetDisableTimestamp() bool { return false } +func (x *Logger_Logrus) GetForceColors() bool { + if x != nil { + return x.ForceColors + } + return false +} + // Fluent type Logger_Fluent struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -447,7 +455,7 @@ var File_conf_v1_kratos_conf_logger_proto protoreflect.FileDescriptor const file_conf_v1_kratos_conf_logger_proto_rawDesc = "" + "\n" + - " conf/v1/kratos_conf_logger.proto\x12\x04conf\"\xc4\a\n" + + " conf/v1/kratos_conf_logger.proto\x12\x04conf\"\xe7\a\n" + "\x06Logger\x12\x12\n" + "\x04type\x18\x01 \x01(\tR\x04type\x12'\n" + "\x03zap\x18\x02 \x01(\v2\x10.conf.Logger.ZapH\x00R\x03zap\x88\x01\x01\x120\n" + @@ -461,13 +469,14 @@ const file_conf_v1_kratos_conf_logger_proto_rawDesc = "" + "\bmax_size\x18\x03 \x01(\x05R\amaxSize\x12\x17\n" + "\amax_age\x18\x04 \x01(\x05R\x06maxAge\x12\x1f\n" + "\vmax_backups\x18\x05 \x01(\x05R\n" + - "maxBackups\x1a\xbb\x01\n" + + "maxBackups\x1a\xde\x01\n" + "\x06Logrus\x12\x14\n" + "\x05level\x18\x01 \x01(\tR\x05level\x12\x1c\n" + "\tformatter\x18\x02 \x01(\tR\tformatter\x12)\n" + "\x10timestamp_format\x18\x03 \x01(\tR\x0ftimestampFormat\x12%\n" + "\x0edisable_colors\x18\x04 \x01(\bR\rdisableColors\x12+\n" + - "\x11disable_timestamp\x18\x05 \x01(\bR\x10disableTimestamp\x1a$\n" + + "\x11disable_timestamp\x18\x05 \x01(\bR\x10disableTimestamp\x12!\n" + + "\fforce_colors\x18\x06 \x01(\bR\vforceColors\x1a$\n" + "\x06Fluent\x12\x1a\n" + "\bendpoint\x18\x01 \x01(\tR\bendpoint\x1a\x82\x01\n" + "\x06Aliyun\x12\x1a\n" + diff --git a/api/protos/conf/v1/kratos_conf_logger.proto b/api/protos/conf/v1/kratos_conf_logger.proto index d8f7cea..2fda6a0 100644 --- a/api/protos/conf/v1/kratos_conf_logger.proto +++ b/api/protos/conf/v1/kratos_conf_logger.proto @@ -22,6 +22,7 @@ message Logger { string timestamp_format = 3; // 定义时间戳格式,例如:"2006-01-02 15:04:05" bool disable_colors = 4; // 不需要彩色日志 bool disable_timestamp = 5; // 不需要时间戳 + bool force_colors = 6; // 是否开启彩色日志 } // Fluent diff --git a/logger/logrus/client.go b/logger/logrus/client.go index 7ed969f..c241d6f 100644 --- a/logger/logrus/client.go +++ b/logger/logrus/client.go @@ -26,6 +26,7 @@ func NewLogger(cfg *conf.Logger) log.Logger { fallthrough case "text": loggerFormatter = &logrus.TextFormatter{ + ForceColors: cfg.Logrus.ForceColors, DisableColors: cfg.Logrus.DisableColors, DisableTimestamp: cfg.Logrus.DisableTimestamp, TimestampFormat: cfg.Logrus.TimestampFormat,