syntax fixes

This commit is contained in:
ston1th 2021-11-05 21:55:18 +01:00
commit 1ce33aa89a
13 changed files with 45 additions and 43 deletions

View file

@ -33,12 +33,12 @@ var (
configFile string
)
func initServer(cfg core.Config) (err error) {
func initServer(cfg *core.Config) (err error) {
// remove initial pledge due to violation with go1.12
// sysctl kern.somaxconn
//if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock proc exec id unveil"); err != nil {
// return
//}
// if err = godrop.PledgePromises("stdio rpath wpath cpath inet fattr flock proc exec id unveil"); err != nil {
// return
// }
dropCfg := godrop.Config{
User: cfg.User,
Group: cfg.Group,
@ -117,7 +117,7 @@ func Run(version string) {
stdlog.Fatal("server: ", err)
}
config.Version = app.Version
if err := initServer(config); err != nil {
if err := initServer(&config); err != nil {
stdlog.Fatal("server: ", err)
}
return nil
@ -137,12 +137,12 @@ func Run(version string) {
}
log.Stderr()
if dumpFile != "-" {
file, err = os.OpenFile(dumpFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
file, err = os.OpenFile(dumpFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o600)
if err != nil {
stdlog.Fatal("dump: ", err)
}
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("dump: ", err)
}
@ -175,7 +175,7 @@ func Run(version string) {
stdlog.Fatal("restore: ", err)
}
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("restore: ", err)
}
@ -199,7 +199,7 @@ func Run(version string) {
if err = loadConfig(); err != nil {
stdlog.Fatal("resetadmin: ", err)
}
DB, err := db.NewPlain(config)
DB, err := db.NewPlain(&config)
if err != nil {
stdlog.Fatal("resetadmin: ", err)
}