paulbsd/ipbl
1
0
Fork 0
Code Issues Pull Requests Projects Releases 29 Wiki Activity

move scanip from cmdline to config
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Paul 2024-09-11 13:28:09 +02:00
parent 6561a77d6d
commit 4e979d76a3
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ipbl/ipbl.go
View File

@ -36,7 +36,7 @@ func main() {
} }
defer cfg.Db.Close() defer cfg.Db.Close()
if !cfg.Switchs.NoScanIP { if cfg.Options.ScanIP {
go models.ScanIP(&cfg) go models.ScanIP(&cfg)
} }

6
src/config/main.go
View File

@ -14,7 +14,6 @@ func (cfg *Config) GetConfig() error {
var init bool var init bool
var port int var port int
var version bool var version bool
var noscanip bool
var migrate bool var migrate bool
flag.Usage = utils.Usage flag.Usage = utils.Usage
@ -24,7 +23,6 @@ func (cfg *Config) GetConfig() error {
flag.BoolVar(&drop, "drop", false, "If dropping tables must occur") flag.BoolVar(&drop, "drop", false, "If dropping tables must occur")
flag.BoolVar(&init, "init", false, "If init of database must be done") flag.BoolVar(&init, "init", false, "If init of database must be done")
flag.BoolVar(&version, "version", false, "Show version") flag.BoolVar(&version, "version", false, "Show version")
flag.BoolVar(&noscanip, "noscanip", false, "Do not run scanip")
flag.BoolVar(&migrate, "migrate", false, "Do migrations on version changes") flag.BoolVar(&migrate, "migrate", false, "Do migrations on version changes")
flag.Parse() flag.Parse()
@ -33,7 +31,6 @@ func (cfg *Config) GetConfig() error {
cfg.Switchs.Init = init cfg.Switchs.Init = init
cfg.Switchs.Port = port cfg.Switchs.Port = port
cfg.Switchs.Version = version cfg.Switchs.Version = version
cfg.Switchs.NoScanIP = noscanip
cfg.Switchs.Migrate = migrate cfg.Switchs.Migrate = migrate
var inicfg, err = ini.Load(configfile) var inicfg, err = ini.Load(configfile)
@ -51,6 +48,7 @@ func (cfg *Config) GetConfig() error {
cfg.Options.SocketChannel = "ipbl" cfg.Options.SocketChannel = "ipbl"
cfg.Options.HideBanner = ipblsection.Key("hidebanner").MustBool(false) cfg.Options.HideBanner = ipblsection.Key("hidebanner").MustBool(false)
cfg.Options.Debug = ipblsection.Key("debug").MustBool(false) cfg.Options.Debug = ipblsection.Key("debug").MustBool(false)
cfg.Options.ScanIP = ipblsection.Key("scanip").MustBool(false)
return nil return nil
} }
@ -68,6 +66,7 @@ type Config struct {
HideBanner bool HideBanner bool
SocketChannel string SocketChannel string
Debug bool Debug bool
ScanIP bool
} }
Switchs struct { Switchs struct {
Port int Port int
@ -75,7 +74,6 @@ type Config struct {
Drop bool Drop bool
Init bool Init bool
Version bool Version bool
NoScanIP bool
Migrate bool Migrate bool
} }
} }