removed cron job

cmd/ipbl/ipbl.go

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

src/models/ip.go

@@ -64,35 +64,30 @@ func InsertIPBulk(cfg *config.Config, ips *[]IP) (numinserts int64, numfail int6
 	return
 }
 
-func ScanIP(cfg *config.Config, lock *bool) (err error) {
-	if !*lock {
-		*lock = true
-		for {
-			var orphans = []IP{}
-			cfg.Db.Where("rdns IS NULL").Asc("ip").Find(&orphans)
-			if len(orphans) > 0 {
-				for _, i := range orphans {
-					reverse, _ := i.UpdateRDNS()
-					if reverse == "" {
-						fmt.Printf("Set \"none\" rdns to IP %s\n", i.IP)
-						i.Rdns.String = "none"
-					} else {
-						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)
-					if err != nil {
-						log.Println(err)
-					}
+func ScanIP(cfg *config.Config) (err error) {
+	for {
+		var orphans = []IP{}
+		cfg.Db.Where("rdns IS NULL").Asc("ip").Find(&orphans)
+		if len(orphans) > 0 {
+			for _, i := range orphans {
+				reverse, _ := i.UpdateRDNS()
+				if reverse == "" {
+					fmt.Printf("Set \"none\" rdns to IP %s\n", i.IP)
+					i.Rdns.String = "none"
+				} else {
+					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)
+				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