Commit c8d6072

committed

Merge branch '266-fix-dsa-error-message' into 'master'

fix: change the error message when reading DataStateAt from DBMarker failed (#266) Closes #266 See merge request postgres-ai/database-lab!293

2 parents f4fc4bd + 53c6b61 commit c8d6072Copy full SHA for c8d6072

File tree

-3

lines changed

pkg
- retrieval/engine/postgres/snapshot
  - snapshot.go
- services/provision/pool
  - pool_manager.go

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`func extractDataStateAt(dbMarker *dbmarker.Marker) string {`
`17`	`17`	`dbMark, err := dbMarker.GetConfig()`
`18`	`18`	`if err != nil {`
`19`		`- log.Err("Failed to retrieve dataStateAt from DBMarker config:", err)`
	`19`	`+ log.Msg("Cannot retrieve dataStateAt from DBMarker config:", err)`
`20`	`20`	`return ""`
`21`	`21`	`}`
`22`	`22`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ func extractDataStateAt(dataPath string) (*time.Time, error) {`
`266`	`266`
`267`	`267`	`dblabDescription, err := marker.GetConfig()`
`268`	`268`	`if err != nil {`
`269`		`- log.Msg("DBMarker error:", err.Error())`
	`269`	`+ log.Msg("cannot read DBMarker configuration: ", err.Error())`
`270`	`270`	`return nil, err`
`271`	`271`	`}`
`272`	`272`
`@@ -277,7 +277,7 @@ func extractDataStateAt(dataPath string) (*time.Time, error) {`
`277`	`277`
`278`	`278`	`dsa, err := time.Parse(tools.DataStateAtFormat, dblabDescription.DataStateAt)`
`279`	`279`	`if err != nil {`
`280`		`- log.Msg("failed to parse DataStateAt")`
	`280`	`+ log.Msg("failed to parse DataStateAt: ", err.Error())`
`281`	`281`	`return nil, err`
`282`	`282`	`}`
`283`	`283`

Comments

(0)