0ct0pu5/sftpgo-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add a link to the upgrading docs in the error message
Some checks failed
Code scanning - action / CodeQL-Build (push) Has been cancelled
Details
CI / Test and deploy (push) Has been cancelled
Details
CI / Test and deploy Windows (push) Has been cancelled
Details
CI / Test build flags (push) Has been cancelled
Details
CI / Test with PgSQL/MySQL/Cockroach (push) Has been cancelled
Details
CI / Build Linux packages (push) Has been cancelled
Details
CI / golangci-lint (push) Has been cancelled
Details
Docker / Build (push) Has been cancelled
Details

Browse source 
Fixes #1854

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino 2024-12-31 10:04:43 +01:00
parent 484bda7940
commit 37f8fb3a0e
No known key found for this signature in database
GPG key ID: 935D2952DEC4EECF
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/dataprovider/bolt.go
View file

@ -3181,7 +3181,7 @@ func (p *BoltProvider) migrateDatabase() error {
providerLog(logger.LevelDebug, "bolt database is up to date, current version: %d", version)
return ErrNoInitRequired
case version < 29:
err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version)
err = errSchemaVersionTooOld(version)
providerLog(logger.LevelError, "%v", err)
logger.ErrorToConsole("%v", err)
return err

4
internal/dataprovider/dataprovider.go
View file

@ -4688,6 +4688,10 @@ func checkReservedUsernames(username string) error {
return nil
}
func errSchemaVersionTooOld(version int) error {
return fmt.Errorf("database schema version %d is too old, please see the upgrading docs: https://docs.sftpgo.com/latest/data-provider/#upgrading", version)
}
func providerLog(level logger.LogLevel, format string, v ...any) {
logger.Log(level, logSender, "", format, v...)
}

2
internal/dataprovider/mysql.go
View file

@ -798,7 +798,7 @@ func (p *MySQLProvider) migrateDatabase() error {
providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version)
return ErrNoInitRequired
case version < 29:
err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version)
err = errSchemaVersionTooOld(version)
providerLog(logger.LevelError, "%v", err)
logger.ErrorToConsole("%v", err)
return err

2
internal/dataprovider/pgsql.go
View file

@ -822,7 +822,7 @@ func (p *PGSQLProvider) migrateDatabase() error { //nolint:dupl
providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version)
return ErrNoInitRequired
case version < 29:
err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version)
err = errSchemaVersionTooOld(version)
providerLog(logger.LevelError, "%v", err)
logger.ErrorToConsole("%v", err)
return err

2
internal/dataprovider/sqlite.go
View file

@ -718,7 +718,7 @@ func (p *SQLiteProvider) migrateDatabase() error { //nolint:dupl
providerLog(logger.LevelDebug, "sql database is up to date, current version: %d", version)
return ErrNoInitRequired
case version < 29:
err = fmt.Errorf("database schema version %d is too old, please see the upgrading docs", version)
err = errSchemaVersionTooOld(version)
providerLog(logger.LevelError, "%v", err)
logger.ErrorToConsole("%v", err)
return err