From 7631629468e560777fd9d2af502e485fc4bf3632 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 11:52:21 +0800 Subject: [PATCH 01/10] zap --- script/start_rpc_service.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index be63aaf4b..d3935e64f 100644 --- a/script/start_rpc_service.sh +++ b/script/start_rpc_service.sh @@ -79,7 +79,7 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do cmd="./${service_filename[$i]} --port ${service_ports[$j]}" fi echo $cmd - echo "=====================start ${service_filename[$i]}======================">>../logs/openIM.log 2>&1 & + echo "=====================start ${service_filename[$i]}======================">>../logs/openIM.log nohup $cmd >>../logs/openIM.log 2>&1 & sleep 1 pid="netstat -ntlp|grep $j |awk '{printf \$7}'|cut -d/ -f1" From 23c2d81c2c0a23b31afa2e18715e410429ae9ea6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 11:57:37 +0800 Subject: [PATCH 02/10] zap --- script/msg_gateway_start.sh | 2 +- script/msg_transfer_start.sh | 2 +- script/push_start.sh | 2 +- script/sdk_svr_start.sh | 2 +- script/start_all.sh | 2 +- script/start_cron.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/script/msg_gateway_start.sh b/script/msg_gateway_start.sh index 9816b1c49..e29a7ce3d 100755 --- a/script/msg_gateway_start.sh +++ b/script/msg_gateway_start.sh @@ -31,7 +31,7 @@ fi sleep 1 cd ${msg_gateway_binary_root} for ((i = 0; i < ${#ws_ports[@]}; i++)); do - echo "==========================start msg_gateway server===========================">>../logs/openIM.log 2>&1 & + echo "==========================start msg_gateway server===========================">>../logs/openIM.log nohup ./${msg_gateway_name} --port ${rpc_ports[$i]} --ws_port ${ws_ports[$i]} --prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 & done diff --git a/script/msg_transfer_start.sh b/script/msg_transfer_start.sh index 93ec379f8..86b1d62ee 100755 --- a/script/msg_transfer_start.sh +++ b/script/msg_transfer_start.sh @@ -27,7 +27,7 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do if [ $prome_port != "" ]; then cmd="$cmd --prometheus_port $prome_port" fi - echo "==========================start msg_transfer server===========================">>../logs/openIM.log 2>&1 & + echo "==========================start msg_transfer server===========================">>../logs/openIM.log $cmd >>../logs/openIM.log 2>&1 & done diff --git a/script/push_start.sh b/script/push_start.sh index 6728ead97..d047a0500 100644 --- a/script/push_start.sh +++ b/script/push_start.sh @@ -25,7 +25,7 @@ sleep 1 cd ${push_binary_root} for ((i = 0; i < ${#rpc_ports[@]}; i++)); do - echo "==========================start push server===========================">>../logs/openIM.log 2>&1 & + echo "==========================start push server===========================">>../logs/openIM.log nohup ./${push_name} --port ${rpc_ports[$i]} --prometheus_port ${prome_ports[$i]} >>../logs/openIM.log 2>&1 & done diff --git a/script/sdk_svr_start.sh b/script/sdk_svr_start.sh index 8f994b856..c1747fa3b 100644 --- a/script/sdk_svr_start.sh +++ b/script/sdk_svr_start.sh @@ -24,7 +24,7 @@ fi #Waiting port recycling sleep 1 cd ${sdk_server_binary_root} - echo "==========================start js sdk server===========================">>../logs/openIM.log 2>&1 & + echo "==========================start js sdk server===========================">>../logs/openIM.log nohup ./${sdk_server_name} -openIM_ws_address ${ws_address} -sdk_ws_port ${sdkws_ports[0]} -openIM_api_address ${api_address} -openIM_log_level ${logLevel} >>../logs/openIM.log 2>&1 & #Check launched service process diff --git a/script/start_all.sh b/script/start_all.sh index eb6ba102e..01c6ab652 100644 --- a/script/start_all.sh +++ b/script/start_all.sh @@ -22,7 +22,7 @@ echo "==========================================================">>../logs/openI for i in ${need_to_start_server_shell[*]}; do chmod +x $i - echo "=====================exec ${i}======================">>../logs/openIM.log 2>&1 & + echo "=====================exec ${i}======================">>../logs/openIM.log ./$i if [ $? -ne 0 ]; then exit -1 diff --git a/script/start_cron.sh b/script/start_cron.sh index 5aab4c842..a0b62a2d2 100644 --- a/script/start_cron.sh +++ b/script/start_cron.sh @@ -18,7 +18,7 @@ sleep 1 cd ${cron_task_binary_root} #for ((i = 0; i < ${cron_task_service_num}; i++)); do - echo "==========================start cron_task process===========================">>../logs/openIM.log 2>&1 & + echo "==========================start cron_task process===========================">>../logs/openIM.log nohup ./${cron_task_name} >>../logs/openIM.log 2>&1 & #done From daffe8a7b7cab10beb29d966803c63e58496126d Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 12:07:25 +0800 Subject: [PATCH 03/10] zap --- pkg/common/log/zap.go | 9 ++++++++- pkg/common/tracelog/ctx.go | 12 +++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 7d3dc9232..1646bfd03 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -143,7 +143,14 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal } func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} { - keysAndValues = append([]interface{}{constant.OperationID, tracelog.GetOperationID(ctx), constant.OpUserID, tracelog.GetOpUserID(ctx)}, keysAndValues...) + operationID := tracelog.GetOperationID(ctx) + opUserID := tracelog.GetOpUserID(ctx) + if opUserID != "" { + keysAndValues = append([]interface{}{constant.OpUserID, tracelog.GetOpUserID(ctx)}, keysAndValues...) + } + if operationID != "" { + keysAndValues = append([]interface{}{constant.OperationID, tracelog.GetOperationID(ctx)}, keysAndValues...) + } return keysAndValues } diff --git a/pkg/common/tracelog/ctx.go b/pkg/common/tracelog/ctx.go index 233493dbe..d45b13fba 100644 --- a/pkg/common/tracelog/ctx.go +++ b/pkg/common/tracelog/ctx.go @@ -1,6 +1,7 @@ package tracelog import ( + "OpenIM/pkg/common/constant" "OpenIM/pkg/utils" "context" "github.com/sirupsen/logrus" @@ -40,12 +41,17 @@ func GetOperationID(ctx context.Context) string { return f.OperationID } } - return utils.GetFuncName(3) + return "" } func GetOpUserID(ctx context.Context) string { - s, _ := ctx.Value("opUserID").(string) - return s + if ctx.Value(constant.OpUserID) != "" { + s, ok := ctx.Value(constant.OpUserID).(string) + if ok { + return s + } + } + return "" } func Unwrap(err error) error { From 102c300f2444fda8c90aecd11421dc24483e84b8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 12:11:22 +0800 Subject: [PATCH 04/10] zap --- pkg/common/log/zap.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 1646bfd03..36fc5d8e9 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -77,6 +77,7 @@ func NewZapLogger() (*ZapLogger, error) { return nil, err } zl.zap = l.Sugar() + zl.WithValues("PID", os.Getegid()) return zl, nil } From 311cdbfdaebe6f8c08bfe49c3f4ee850be1785f8 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 12:21:12 +0800 Subject: [PATCH 05/10] zap --- pkg/common/log/zap.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 36fc5d8e9..1646bfd03 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -77,7 +77,6 @@ func NewZapLogger() (*ZapLogger, error) { return nil, err } zl.zap = l.Sugar() - zl.WithValues("PID", os.Getegid()) return zl, nil } From b67ce3c462d5f74d664cb8b0f00a34b769be159b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 12:33:26 +0800 Subject: [PATCH 06/10] zap --- pkg/common/log/zap.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 1646bfd03..59b419cef 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -65,9 +65,6 @@ func NewZapLogger() (*ZapLogger, error) { if config.Config.Log.Stderr { zapConfig.OutputPaths = append(zapConfig.OutputPaths, "stderr") } - zapConfig.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder - zapConfig.EncoderConfig.EncodeDuration = zapcore.SecondsDurationEncoder - zapConfig.EncoderConfig.EncodeLevel = zapcore.CapitalColorLevelEncoder opts, err := zl.cores() if err != nil { return nil, err @@ -85,7 +82,12 @@ func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) } func (l *ZapLogger) cores() (zap.Option, error) { - fileEncoder := zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()) + c := zap.NewProductionEncoderConfig() + c.EncodeTime = zapcore.ISO8601TimeEncoder + c.EncodeDuration = zapcore.SecondsDurationEncoder + c.EncodeLevel = zapcore.CapitalColorLevelEncoder + fileEncoder := zapcore.NewJSONEncoder(c) + fileEncoder.AddInt("PID", os.Getpid()) writer, err := l.getWriter() if err != nil { return nil, err From 2d476021a68809fcb1d739f1e47adae4c1553c94 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 12:36:53 +0800 Subject: [PATCH 07/10] zap --- pkg/common/log/zap.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 59b419cef..e5ba69773 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -84,8 +84,8 @@ func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) func (l *ZapLogger) cores() (zap.Option, error) { c := zap.NewProductionEncoderConfig() c.EncodeTime = zapcore.ISO8601TimeEncoder - c.EncodeDuration = zapcore.SecondsDurationEncoder - c.EncodeLevel = zapcore.CapitalColorLevelEncoder + //c.EncodeDuration = zapcore.SecondsDurationEncoder + //c.EncodeLevel = zapcore.CapitalColorLevelEncoder fileEncoder := zapcore.NewJSONEncoder(c) fileEncoder.AddInt("PID", os.Getpid()) writer, err := l.getWriter() From 656206c95a19f440a0590445ba958204d9a4093d Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 13:26:49 +0800 Subject: [PATCH 08/10] zap --- pkg/common/log/zap.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index e5ba69773..4b72e57ed 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -59,7 +59,7 @@ func NewZapLogger() (*ZapLogger, error) { Development: true, Encoding: "json", EncoderConfig: zap.NewProductionEncoderConfig(), - InitialFields: map[string]interface{}{"PID": os.Getegid()}, + //InitialFields: map[string]interface{}{"PID": os.Getegid()}, } zl := &ZapLogger{} if config.Config.Log.Stderr { @@ -83,8 +83,8 @@ func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) func (l *ZapLogger) cores() (zap.Option, error) { c := zap.NewProductionEncoderConfig() - c.EncodeTime = zapcore.ISO8601TimeEncoder - //c.EncodeDuration = zapcore.SecondsDurationEncoder + c.EncodeTime = l.timeEncoder + c.EncodeDuration = zapcore.SecondsDurationEncoder //c.EncodeLevel = zapcore.CapitalColorLevelEncoder fileEncoder := zapcore.NewJSONEncoder(c) fileEncoder.AddInt("PID", os.Getpid()) From 2c08e1c361fb05ec2bdc1c083802af88a7272c94 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 13:32:35 +0800 Subject: [PATCH 09/10] zap --- pkg/common/log/zap.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 4b72e57ed..1631470f2 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -83,9 +83,9 @@ func (l *ZapLogger) timeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) func (l *ZapLogger) cores() (zap.Option, error) { c := zap.NewProductionEncoderConfig() - c.EncodeTime = l.timeEncoder + c.EncodeTime = zapcore.ISO8601TimeEncoder c.EncodeDuration = zapcore.SecondsDurationEncoder - //c.EncodeLevel = zapcore.CapitalColorLevelEncoder + //c.EncodeLevel = zapcore.LowercaseColorLevelEncoder fileEncoder := zapcore.NewJSONEncoder(c) fileEncoder.AddInt("PID", os.Getpid()) writer, err := l.getWriter() From 9d80220d684383039ba89618cbed0ad06824092f Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 14 Mar 2023 13:35:41 +0800 Subject: [PATCH 10/10] zap --- pkg/common/log/zap.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/log/zap.go b/pkg/common/log/zap.go index 1631470f2..aee9aa42d 100644 --- a/pkg/common/log/zap.go +++ b/pkg/common/log/zap.go @@ -59,7 +59,7 @@ func NewZapLogger() (*ZapLogger, error) { Development: true, Encoding: "json", EncoderConfig: zap.NewProductionEncoderConfig(), - //InitialFields: map[string]interface{}{"PID": os.Getegid()}, + InitialFields: map[string]interface{}{"PID": os.Getegid()}, } zl := &ZapLogger{} if config.Config.Log.Stderr {