pages/pages-server
1
0
Fork 0
mirror of https://codeberg.org/Codeberg/pages-server.git synced 2025-04-25 06:16:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve

Browse source
This commit is contained in:
6543 2023-02-09 22:03:11 +01:00
parent 1c5561231b
commit aa21b81586
5 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/certs.go
View file

@ -85,11 +85,11 @@ func migrateCerts(ctx *cli.Context) error {
}
func listCerts(ctx *cli.Context) error {
certDB, close, err := openCertDB(ctx)
certDB, closeFn, err := openCertDB(ctx)
if err != nil {
return err
}
defer close()
defer closeFn()
items, err := certDB.Items(0, 0)
if err != nil {
@ -115,11 +115,11 @@ func removeCert(ctx *cli.Context) error {
domains := ctx.Args().Slice()
certDB, close, err := openCertDB(ctx)
certDB, closeFn, err := openCertDB(ctx)
if err != nil {
return err
}
defer close()
defer closeFn()
for _, domain := range domains {
fmt.Printf("Removing domain %s from the database...\n", domain)

4
cmd/main.go
View file

@ -74,11 +74,11 @@ func Serve(ctx *cli.Context) error {
}
// Init ssl cert database
certDB, close, err := openCertDB(ctx)
certDB, closeFn, err := openCertDB(ctx)
if err != nil {
return err
}
defer close()
defer closeFn()
keyCache := cache.NewKeyValueCache()
challengeCache := cache.NewKeyValueCache()

6
cmd/setup.go
View file

@ -9,7 +9,7 @@ import (
"codeberg.org/codeberg/pages/server/database"
)
func openCertDB(ctx *cli.Context) (certDB database.CertDB, close func(), err error) {
func openCertDB(ctx *cli.Context) (certDB database.CertDB, closeFn func(), err error) {
if ctx.String("db-type") != "" {
log.Trace().Msg("use xorm mode")
certDB, err = database.NewXormDB(ctx.String("db-type"), ctx.String("db-conn"))
@ -35,11 +35,11 @@ The simplest way is, to use './pages certs migrate' and set environment var DB_T
}
}
close = func() {
closeFn = func() {
if err := certDB.Close(); err != nil {
log.Error().Err(err)
}
}
return certDB, close, nil
return certDB, closeFn, nil
}