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

removed cron job
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 2021-12-28 07:27:39 +01:00
parent 826c906777
commit 62bfead182
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ipbl/ipbl.go
View File

@ -9,7 +9,6 @@ import (
"git.paulbsd.com/paulbsd/ipbl/src/models" "git.paulbsd.com/paulbsd/ipbl/src/models"
"git.paulbsd.com/paulbsd/ipbl/src/routers" "git.paulbsd.com/paulbsd/ipbl/src/routers"
_ "github.com/lib/pq" _ "github.com/lib/pq"
"github.com/robfig/cron"
) )
//go:generate ../../scripts/version.sh //go:generate ../../scripts/version.sh
@ -17,7 +16,6 @@ import (
func main() { func main() {
var ctx context.Context var ctx context.Context
var cfg config.Config var cfg config.Config
var lock bool
cfg.GetConfig() cfg.GetConfig()
cfg.Options.Version = version cfg.Options.Version = version
@ -29,14 +27,14 @@ func main() {
defer cfg.Db.Close() defer cfg.Db.Close()
// Handles IP with no reverse DNS // Handles IP with no reverse DNS
go models.ScanIP(&cfg, &lock) go models.ScanIP(&cfg)
// Add cron task to handle them // Add cron task to handle them
cr := cron.New() //cr := cron.New()
cr.AddFunc("0 * * * * *", func() { //cr.AddFunc("0 * * * * *", func() {
models.ScanIP(&cfg, &lock) // models.ScanIP(&cfg)
}) //})
cr.Start() //cr.Start()
// Run the ipbl web service // Run the ipbl web service
err = routers.RunServer(&ctx, &cfg) err = routers.RunServer(&ctx, &cfg)

45
src/models/ip.go
View File

@ -64,35 +64,30 @@ func InsertIPBulk(cfg *config.Config, ips *[]IP) (numinserts int64, numfail int6
return return
} }
func ScanIP(cfg *config.Config, lock *bool) (err error) { func ScanIP(cfg *config.Config) (err error) {
if !*lock { for {
*lock = true var orphans = []IP{}
for { cfg.Db.Where("rdns IS NULL").Asc("ip").Find(&orphans)
var orphans = []IP{} if len(orphans) > 0 {
cfg.Db.Where("rdns IS NULL").Asc("ip").Find(&orphans) for _, i := range orphans {
if len(orphans) > 0 { reverse, _ := i.UpdateRDNS()
for _, i := range orphans { if reverse == "" {
reverse, _ := i.UpdateRDNS() fmt.Printf("Set \"none\" rdns to IP %s\n", i.IP)
if reverse == "" { i.Rdns.String = "none"
fmt.Printf("Set \"none\" rdns to IP %s\n", i.IP) } else {
i.Rdns.String = "none" fmt.Printf("%s %s\n", i.IP, reverse)
} else { i.Rdns.String = reverse
fmt.Printf("%s %s\n", i.IP, reverse) }
i.Rdns.String = reverse i.Rdns.Valid = true
} _, err = cfg.Db.ID(i.ID).Cols("rdns").Update(&i)
i.Rdns.Valid = true if err != nil {
_, err = cfg.Db.ID(i.ID).Cols("rdns").Update(&i) log.Println(err)
if err != nil {
log.Println(err)
}
} }
} else {
break
} }
} else {
time.Sleep(60 * time.Second)
} }
} }
*lock = false
return
} }
// APIFormat returns a JSON formatted object of IP // APIFormat returns a JSON formatted object of IP