mirror of
https://github.com/safing/portmaster
synced 2025-09-05 03:59:11 +00:00
Add devmode config override via flag
This commit is contained in:
parent
a410e27fa4
commit
edebfbd687
2 changed files with 28 additions and 2 deletions
|
@ -1,13 +1,27 @@
|
||||||
package core
|
package core
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"flag"
|
||||||
|
|
||||||
"github.com/safing/portbase/config"
|
"github.com/safing/portbase/config"
|
||||||
|
"github.com/safing/portbase/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
devMode config.BoolOption
|
devMode config.BoolOption
|
||||||
|
defaultDevMode bool
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
flag.BoolVar(&defaultDevMode, "devmode", false, "force development mode")
|
||||||
|
}
|
||||||
|
|
||||||
|
func logFlagOverrides() {
|
||||||
|
if defaultDevMode {
|
||||||
|
log.Warning("core: core/devMode default config is being forced by -devmode flag")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func registerConfig() error {
|
func registerConfig() error {
|
||||||
err := config.Register(&config.Option{
|
err := config.Register(&config.Option{
|
||||||
Name: "Development Mode",
|
Name: "Development Mode",
|
||||||
|
@ -15,7 +29,7 @@ func registerConfig() error {
|
||||||
Description: "In Development Mode security restrictions are lifted/softened to enable easier access to Portmaster for debugging and testing purposes. This is potentially very insecure, only activate if you know what you are doing.",
|
Description: "In Development Mode security restrictions are lifted/softened to enable easier access to Portmaster for debugging and testing purposes. This is potentially very insecure, only activate if you know what you are doing.",
|
||||||
ExpertiseLevel: config.ExpertiseLevelDeveloper,
|
ExpertiseLevel: config.ExpertiseLevelDeveloper,
|
||||||
OptType: config.OptTypeBool,
|
OptType: config.OptTypeBool,
|
||||||
DefaultValue: true,
|
DefaultValue: defaultDevMode,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
12
core/main.go
12
core/main.go
|
@ -4,6 +4,7 @@ import (
|
||||||
"errors"
|
"errors"
|
||||||
"flag"
|
"flag"
|
||||||
|
|
||||||
|
"github.com/safing/portbase/api"
|
||||||
"github.com/safing/portbase/modules"
|
"github.com/safing/portbase/modules"
|
||||||
"github.com/safing/portbase/notifications"
|
"github.com/safing/portbase/notifications"
|
||||||
|
|
||||||
|
@ -37,11 +38,22 @@ func prep() error {
|
||||||
return errors.New("please set the data directory using --data=/path/to/data/dir")
|
return errors.New("please set the data directory using --data=/path/to/data/dir")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set api listen address
|
||||||
|
api.SetDefaultAPIListenAddress("127.0.0.1:817")
|
||||||
|
|
||||||
|
// init config
|
||||||
|
err := registerConfig()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
// initialize structure
|
// initialize structure
|
||||||
return structure.Initialize(dataDir, 0755)
|
return structure.Initialize(dataDir, 0755)
|
||||||
}
|
}
|
||||||
|
|
||||||
func start() error {
|
func start() error {
|
||||||
|
logFlagOverrides()
|
||||||
|
|
||||||
// init DB
|
// init DB
|
||||||
err := startDB()
|
err := startDB()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Add table
Reference in a new issue