From e526cff3e7f55c61d65bec751b57731176ccf84a Mon Sep 17 00:00:00 2001
From: "A. Svensson" <lmasvensson@gmail.com>
Date: Thu, 21 Apr 2016 14:59:43 +0200
Subject: [PATCH] Removed the IsDebug* crap.

---
 src/poller.go  |  2 +-
 src/scraper.go |  9 ++++-----
 src/updater.go |  6 +++---
 src/utils.go   | 11 +----------
 src/web.go     |  1 -
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/poller.go b/src/poller.go
index 3891c8c..9652058 100644
--- a/src/poller.go
+++ b/src/poller.go
@@ -57,7 +57,7 @@ func poll_players(host string, timeout int) (int, error) {
 	return int(players), nil
 }
 
-func PollServers(servers []ServerConfig, timeout int) ([]*RawServerData, error) {
+func (i *Instance) PollServers(servers []ServerConfig, timeout int) ([]*RawServerData, error) {
 	var wg sync.WaitGroup
 	var tmp []*RawServerData
 	for _, s := range servers {
diff --git a/src/scraper.go b/src/scraper.go
index 4acdf7c..31545d6 100644
--- a/src/scraper.go
+++ b/src/scraper.go
@@ -19,8 +19,8 @@ var (
 	RE_PLAYERS = regexp.MustCompile(`Logged in: (\d+) player`)
 )
 
-func ScrapePage() ([]*RawServerData, error) {
-	data, err := download_data()
+func (i *Instance) ScrapePage() ([]*RawServerData, error) {
+	data, err := download_data(i.Debug)
 	if err != nil {
 		return nil, err
 	}
@@ -32,10 +32,9 @@ func ScrapePage() ([]*RawServerData, error) {
 	return tmp, nil
 }
 
-func download_data() (*goquery.Document, error) {
+func download_data(debug bool) (*goquery.Document, error) {
 	var r io.Reader
-	if IsDebugging() {
-		fmt.Println("Scraper data source: ./dump.html")
+	if debug {
 		f, err := os.Open("./tmp/dump.html")
 		if err != nil {
 			return nil, err
diff --git a/src/updater.go b/src/updater.go
index 28add56..6f8ceff 100644
--- a/src/updater.go
+++ b/src/updater.go
@@ -27,7 +27,7 @@ func (i *Instance) UpdateServers() {
 		if i.Debug {
 			fmt.Println("\nPolling servers...")
 		}
-		polled, err := PollServers(config.PollServers, config.Timeout)
+		polled, err := i.PollServers(config.PollServers, config.Timeout)
 		if !log_error(err) {
 			for _, s := range polled {
 				i.update_server(tx, s)
@@ -38,7 +38,7 @@ func (i *Instance) UpdateServers() {
 	if i.Debug {
 		fmt.Println("\nScraping servers...")
 	}
-	scraped, err := ScrapePage()
+	scraped, err := i.ScrapePage()
 	if !log_error(err) {
 		for _, s := range scraped {
 			i.update_server(tx, s)
@@ -99,7 +99,7 @@ func (i *Instance) update_server(tx *DB, s *RawServerData) {
 		return
 	}
 
-	if IsDebugging() {
+	if i.Debug {
 		fmt.Println(s.Title)
 	}
 
diff --git a/src/utils.go b/src/utils.go
index 324fe30..fc138ab 100644
--- a/src/utils.go
+++ b/src/utils.go
@@ -6,8 +6,7 @@ import (
 )
 
 var (
-	now            = time.Now()
-	debugging bool = false
+	now = time.Now()
 )
 
 func log_error(err error) bool {
@@ -24,14 +23,6 @@ func check_error(err error) {
 	}
 }
 
-func SetDebug(val bool) {
-	debugging = val
-}
-
-func IsDebugging() bool {
-	return debugging
-}
-
 func ResetNow() {
 	now = time.Now()
 }
diff --git a/src/web.go b/src/web.go
index 61130dc..891b539 100644
--- a/src/web.go
+++ b/src/web.go
@@ -11,7 +11,6 @@ import (
 
 func (i *Instance) Init() {
 	i.DB.InitSchema()
-	SetDebug(i.Debug) // TODO: get rid of this stupid debug thing
 }
 
 func (i *Instance) Serve(addr string) error {