improve context key and caller path&func outputs for logger of package glog

Author: gqcn

database/gdb/gdb_core.go

@@ -658,9 +658,9 @@ func (c *Core) writeSqlToLogger(ctx context.Context, sql *Sql) {
 	s := fmt.Sprintf("[%3d ms] [%s] %s%s", sql.End-sql.Start, sql.Group, transactionIdStr, sql.Format)
 	if sql.Error != nil {
 		s += "\nError: " + sql.Error.Error()
-		c.logger.Error(ctx, s)
+		c.logger.Ctx(ctx).Error(s)
 	} else {
-		c.logger.Debug(ctx, s)
+		c.logger.Ctx(ctx).Debug(s)
 	}
 }
 

os/glog/glog_logger_handler.go

@@ -61,18 +61,18 @@ func (i *HandlerInput) getBuffer(withColor bool) *bytes.Buffer {
 			i.addStringToBuffer(buffer, i.LevelFormat)
 		}
 	}
-	if i.CallerFunc != "" {
-		i.addStringToBuffer(buffer, i.CallerFunc)
-	}
-	if i.CallerPath != "" {
-		i.addStringToBuffer(buffer, i.CallerPath)
-	}
 	if i.Prefix != "" {
 		i.addStringToBuffer(buffer, i.Prefix)
 	}
 	if i.CtxStr != "" {
 		i.addStringToBuffer(buffer, i.CtxStr)
 	}
+	if i.CallerFunc != "" {
+		i.addStringToBuffer(buffer, i.CallerFunc)
+	}
+	if i.CallerPath != "" {
+		i.addStringToBuffer(buffer, i.CallerPath)
+	}
 	if i.Content != "" {
 		i.addStringToBuffer(buffer, i.Content)
 	}