Commit 9a310ea9 authored by 谢宇轩's avatar 谢宇轩 😅

重新规划时区的配置

parent dc02ba53
...@@ -18,4 +18,6 @@ WORKDIR /app ...@@ -18,4 +18,6 @@ WORKDIR /app
COPY --from=build /app /app COPY --from=build /app /app
VOLUME /app/log/
ENTRYPOINT ["/app/logtransfer"] ENTRYPOINT ["/app/logtransfer"]
...@@ -8,10 +8,6 @@ import ( ...@@ -8,10 +8,6 @@ import (
"time" "time"
) )
const (
Location = "Asia/Shanghai"
)
type Formater func(string, string) (Matedata, error) type Formater func(string, string) (Matedata, error)
// service错误日志的处理 // service错误日志的处理
...@@ -28,11 +24,9 @@ func FormatServiceWfLog(sourceKey string, message string) (Matedata, error) { ...@@ -28,11 +24,9 @@ func FormatServiceWfLog(sourceKey string, message string) (Matedata, error) {
mateItem.Level = message[:levelIndex] mateItem.Level = message[:levelIndex]
message = message[levelIndex:] message = message[levelIndex:]
loc, err := time.LoadLocation("UTC") // 给时间调回UTC+8
if err != nil { logTime, _ := time.ParseInLocation(": 06-01-02 15:04:05 ", message[:strings.Index(message, "[")], time.FixedZone("UTC", 8*3600))
loc = time.FixedZone("UTC", 0)
}
logTime, _ := time.ParseInLocation(": 06-01-02 15:04:05 ", message[:strings.Index(message, "[")], loc)
mateItem.create = logTime mateItem.create = logTime
keyword := serviceWfLogKeyWord keyword := serviceWfLogKeyWord
for _, word := range keyword { for _, word := range keyword {
...@@ -51,7 +45,9 @@ func FormatServiceWfLog(sourceKey string, message string) (Matedata, error) { ...@@ -51,7 +45,9 @@ func FormatServiceWfLog(sourceKey string, message string) (Matedata, error) {
} }
} }
mateItem.Data["timestamp"] = mateItem.create.Format("2006-01-02 15:04:05") // 那这里获取UTC时间为8小时前
mateItem.Data["timestamp"] = mateItem.create.UTC().Format("2006-01-02 15:04:05")
result := *mateItem result := *mateItem
mateItem.reset() mateItem.reset()
MatePool.Put(mateItem) MatePool.Put(mateItem)
......
...@@ -8,10 +8,6 @@ import ( ...@@ -8,10 +8,6 @@ import (
"github.com/y7ut/logtransfer/entity" "github.com/y7ut/logtransfer/entity"
) )
const (
Location = "Asia/Shanghai"
)
// 打印插件 // 打印插件
type Dump Plugin type Dump Plugin
...@@ -19,14 +15,15 @@ func (dump *Dump) HandleFunc(m *entity.Matedata) error { ...@@ -19,14 +15,15 @@ func (dump *Dump) HandleFunc(m *entity.Matedata) error {
log.Println("DUMP:") log.Println("DUMP:")
for k, v := range (*m).Data { for k, v := range (*m).Data {
if k == "timestamp" { if k == "timestamp" {
loc, err := time.LoadLocation(Location) // 这里需要回显 假设现在是UTC-8
if err != nil { loc := time.FixedZone("UTC", -8*3600)
loc = time.FixedZone("CST", 8*3600) createdAt, err := time.ParseInLocation("2006-01-02 15:04:05 ", fmt.Sprintf("%s", v), loc)
}
v, err = time.ParseInLocation("2006-01-02 15:04:05 ", fmt.Sprintf("%s", v), loc)
if err != nil { if err != nil {
continue continue
} }
log.Println("DP",createdAt)
// UTC时间就是+8小时
v = createdAt.UTC().Format("2006-01-02 15:04:05")
} }
fmt.Printf("%s : %s\n", k, v) fmt.Printf("%s : %s\n", k, v)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment