From 66cad28cf9a824163a257b2a5de650ff86c7e07a Mon Sep 17 00:00:00 2001
From: "A. Svensson" <lmasvensson@gmail.com>
Date: Sat, 20 Feb 2016 20:14:00 +0100
Subject: [PATCH] Fix removing inactive servers and avoid doing unneeded work.

---
 src/db.go      |  2 +-
 src/updater.go | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/db.go b/src/db.go
index cdfff02..9407325 100644
--- a/src/db.go
+++ b/src/db.go
@@ -42,7 +42,7 @@ func GetOldServers(db *gorm.DB, ts time.Time) []*Server {
 }
 
 func RemoveOldServers(db *gorm.DB, ts time.Time) {
-	db.Where("last_updated < datetime(?, '-7 days')").Delete(Server{})
+	db.Where("last_updated < datetime(?, '-7 days')", ts).Delete(Server{})
 }
 
 func GetServerPopulation(db *gorm.DB, id int, d time.Duration) []*ServerPopulation {
diff --git a/src/updater.go b/src/updater.go
index f43624b..4dc7570 100644
--- a/src/updater.go
+++ b/src/updater.go
@@ -39,17 +39,17 @@ func (i *Instance) UpdateServers() {
 		i.update_server(s)
 	}
 
+	if i.Debug {
+		fmt.Println("\nRemoving old servers...")
+	}
+	RemoveOldServers(i.DB, Now())
+
 	if i.Debug {
 		fmt.Println("\nUpdating inactive servers...")
 	}
 	for _, s := range i.get_old_servers() {
 		i.update_server(s)
 	}
-
-	if i.Debug {
-		fmt.Println("\nRemoving old servers...")
-	}
-	RemoveOldServers(i.DB, Now())
 }
 
 func reset() {