Fix merge error
This commit is contained in:
@@ -13,6 +13,7 @@ import (
|
|||||||
"github.com/tevino/abool"
|
"github.com/tevino/abool"
|
||||||
"golang.org/x/sync/singleflight"
|
"golang.org/x/sync/singleflight"
|
||||||
|
|
||||||
|
"github.com/safing/portbase/config"
|
||||||
"github.com/safing/portbase/log"
|
"github.com/safing/portbase/log"
|
||||||
"github.com/safing/portbase/modules"
|
"github.com/safing/portbase/modules"
|
||||||
"github.com/safing/portmaster/compat"
|
"github.com/safing/portmaster/compat"
|
||||||
@@ -44,6 +45,12 @@ var (
|
|||||||
ownPID = os.Getpid()
|
ownPID = os.Getpid()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Config variables for interception module.
|
||||||
|
var (
|
||||||
|
devMode config.BoolOption
|
||||||
|
apiListenAddress config.StringOption
|
||||||
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
configChangeEvent = "config change"
|
configChangeEvent = "config change"
|
||||||
profileConfigChangeEvent = "profile config change"
|
profileConfigChangeEvent = "profile config change"
|
||||||
|
|||||||
Reference in New Issue
Block a user