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

update selecting trigger
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone Build is failing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Paul 2022-01-30 23:48:13 +01:00
parent fb45356a08
commit 5a61660567
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/models/ip.go
View File

@ -25,7 +25,7 @@ func GetIPs(ctx *context.Context, config *config.Config, limit int) (apimailboxe
// GetIPs ... // GetIPs ...
func GetIPsLastDay(ctx *context.Context, config *config.Config, interval string) (apimailboxes []*api.IP, err error) { func GetIPsLastDay(ctx *context.Context, config *config.Config, interval string) (apimailboxes []*api.IP, err error) {
var ips []IP var ips []IP
err = config.Db.Where(fmt.Sprintf("created >= (now()-'%s'::interval)", interval)).Desc("created").Find(&ips) err = config.Db.Where(fmt.Sprintf("updated >= (now()-'%s'::interval)", interval)).Asc("id").Find(&ips)
for _, ml := range ips { for _, ml := range ips {
apimailboxes = append(apimailboxes, ml.APIFormat()) apimailboxes = append(apimailboxes, ml.APIFormat())
} }
@ -66,16 +66,19 @@ func (i *IP) InsertIP(cfg *config.Config) (num int64, err error) {
// InsertIPBulk ... // InsertIPBulk ...
func InsertIPBulk(cfg *config.Config, ips *[]IP) (numinserts int64, numupdates int64, numfail int64, err error) { func InsertIPBulk(cfg *config.Config, ips *[]IP) (numinserts int64, numupdates int64, numfail int64, err error) {
lastday := time.Now().Add(-(time.Hour * 24))
for _, ip := range *ips { for _, ip := range *ips {
s_ip := IP{IP: ip.IP} s_ip := IP{IP: ip.IP}
res, _ := cfg.Db.Get(&s_ip) res, _ := cfg.Db.Get(&s_ip)
if res { if res {
num, err := cfg.Db.ID(s_ip.ID).Update(&s_ip) if !s_ip.Updated.After(lastday) {
if err != nil { num, err := cfg.Db.ID(s_ip.ID).Update(&s_ip)
numfail++ if err != nil {
continue numfail++
continue
}
numupdates += num
} }
numupdates += num
} else { } else {
num, err := cfg.Db.Insert(ip) num, err := cfg.Db.Insert(ip)
if err != nil { if err != nil {