Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 8dcc777

Browse files
committed
fix(engine): parse timezone of the lastActivity date (#483)
1 parent 2ed8a5a commit 8dcc777

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

‎engine/pkg/util/pglog/activity.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func ParsePostgresLastActivity(logTime, text string) (*time.Time, error) {
129129
return nil, nil
130130
}
131131

132-
lastActivityTime, err := time.Parse("2006-01-02 15:04:05.000 UTC", logTime)
132+
lastActivityTime, err := time.Parse("2006-01-02 15:04:05.000 MST", logTime)
133133
if err != nil {
134134
return nil, errs.Wrap(err, "failed to parse the last activity time")
135135
}

‎engine/pkg/util/pglog/activity_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ func TestGetPostgresLastActivity(t *testing.T) {
2020
logMessage: "duration: 9.893 ms statement: SELECT 1;",
2121
timeActivity: pointer.ToTime(time.Date(2020, 1, 10, 11, 49, 14, 615000000, time.UTC)),
2222
},
23+
{
24+
logTime: "2020年01月10日 11:49:14.615 CET",
25+
logMessage: "duration: 9.893 ms statement: SELECT 1;",
26+
timeActivity: pointer.ToTime(time.Date(2020, 1, 10, 11, 49, 14, 615000000, time.FixedZone("CET", 0))),
27+
},
2328
{
2429
logTime: "2020年01月11日 13:10:58.503 UTC",
2530
logMessage: "duration: 0.077 ms statement:",
@@ -58,7 +63,7 @@ func TestGetPostgresLastActivityWhenFailedParseTime(t *testing.T) {
5863
{
5964
logTime: "2020年01月10日 11:49:14",
6065
logMessage: "duration: 9.893 ms statement: SELECT 1;",
61-
errorString: `failed to parse the last activity time: parsing time "2020-01-10 11:49:14" as "2006-01-02 15:04:05.000 UTC": cannot parse "" as ".000"`,
66+
errorString: `failed to parse the last activity time: parsing time "2020-01-10 11:49:14" as "2006-01-02 15:04:05.000 MST": cannot parse "" as ".000"`,
6267
},
6368
}
6469

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /