vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-02 10:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #17 from safing/fix/data-root-init

Browse source 
Fix setting data root in startup procedure
This commit is contained in:
Daniel 2019-08-19 19:49:46 +02:00 • committed by GitHub
commit a2a52eb7cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/base.go
View file

@ -4,6 +4,8 @@ import (
"errors" "errors"
"flag" "flag"
"github.com/safing/portbase/config"
"github.com/safing/portbase/api" "github.com/safing/portbase/api"
"github.com/safing/portbase/database/dbmodule" "github.com/safing/portbase/database/dbmodule"
"github.com/safing/portbase/modules" "github.com/safing/portbase/modules"
@ -43,8 +45,9 @@ func prepBase() error {
return err return err
} }
// set database location // set data location
dbmodule.SetDatabaseLocation("", structure.Root()) dbmodule.SetDatabaseLocation("", structure.Root())
config.SetDataRoot(structure.Root())
// init config // init config
logFlagOverrides() logFlagOverrides()

2
main.go
View file

@ -33,7 +33,7 @@ func init() {
func main() { func main() {
// Set Info // Set Info
info.Set("Portmaster", "0.3.8", "AGPLv3", true) info.Set("Portmaster", "0.3.9", "AGPLv3", true)
// Start // Start
err := modules.Start() err := modules.Start()