Commit d19cffd

agneumNikolayS

authored and

committed

fix: update DSA format and sessionID in the foreword (platform#260)

1 parent e6c4bc4 commit d19cffdCopy full SHA for d19cffd

File tree

-5

lines changed

-5

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,13 @@ func ResetSession(ctx context.Context, cmd platform.Command, msg models.Messag`
`59`	`59`	`session.CloneConnection = cloneConn.Conn()`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ sessionID := session.PlatformSessionID`
	`63`	`+ if sessionID == "" {`
	`64`	`+ sessionID = clone.ID`
	`65`	`+ }`
	`66`	`+`
`62`	`67`	`fwData := &foreword.Content{`
`63`		`- SessionID: clone.ID,`
	`68`	`+ SessionID: sessionID,`
`64`	`69`	`Duration: time.Duration(clone.Metadata.MaxIdleMinutes) * time.Minute,`
`65`	`70`	`AppVersion: appVersion,`
`66`	`71`	`Edition: edition,`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,6 @@ Database size: %s`
`30`	`30`	`Database state at: %s (%s ago)`
`31`	`31`	` + "```"
`32`	`32`
`33`		`-// TODO(akartasov): use const from the Database Lab repository.`
`34`		`-const dsaFormat = "2006年01月02日 15:04:05 UTC"`
`35`		`-`
`36`	`33`	`// Content defines data for a foreword message.`
`37`	`34`	`type Content struct {`
`38`	`35`	`Duration time.Duration`
`@@ -54,7 +51,7 @@ func (f Content) EnrichForewordInfo(ctx context.Context, db pgxpool.Pool) erro`
`54`	`51`	`return errors.Wrap(err, "failed to retrieve database meta info")`
`55`	`52`	`}`
`56`	`53`
`57`		`- dsaTime, err := time.Parse(dsaFormat, f.DSA)`
	`54`	`+ dsaTime, err := time.Parse(time.RFC3339, f.DSA)`
`58`	`55`	`if err != nil {`
`59`	`56`	`log.Err("failed to parse the 'data state at' timestamp of the database snapshot: ", err)`
`60`	`57`	`return nil`

Comments

(0)