erki/ss13_se
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed the IsDebug* crap.

Browse Source
This commit is contained in:
A. Svensson 2016-04-21 14:59:43 +02:00
parent 014b42cbb3
commit e526cff3e7
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/poller.go
View File

@ -57,7 +57,7 @@ func poll_players(host string, timeout int) (int, error) {
return int(players), nil 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 wg sync.WaitGroup
var tmp []*RawServerData var tmp []*RawServerData
for _, s := range servers { for _, s := range servers {

9
src/scraper.go
View File

@ -19,8 +19,8 @@ var (
RE_PLAYERS = regexp.MustCompile(`Logged in: (\d+) player`) RE_PLAYERS = regexp.MustCompile(`Logged in: (\d+) player`)
) )
func ScrapePage() ([]*RawServerData, error) { func (i *Instance) ScrapePage() ([]*RawServerData, error) {
data, err := download_data() data, err := download_data(i.Debug)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -32,10 +32,9 @@ func ScrapePage() ([]*RawServerData, error) {
return tmp, nil return tmp, nil
} }
func download_data() (*goquery.Document, error) { func download_data(debug bool) (*goquery.Document, error) {
var r io.Reader var r io.Reader
if IsDebugging() { if debug {
fmt.Println("Scraper data source: ./dump.html")
f, err := os.Open("./tmp/dump.html") f, err := os.Open("./tmp/dump.html")
if err != nil { if err != nil {
return nil, err return nil, err

6
src/updater.go
View File

@ -27,7 +27,7 @@ func (i *Instance) UpdateServers() {
if i.Debug { if i.Debug {
fmt.Println("\nPolling servers...") fmt.Println("\nPolling servers...")
} }
polled, err := PollServers(config.PollServers, config.Timeout) polled, err := i.PollServers(config.PollServers, config.Timeout)
if !log_error(err) { if !log_error(err) {
for _, s := range polled { for _, s := range polled {
i.update_server(tx, s) i.update_server(tx, s)
@ -38,7 +38,7 @@ func (i *Instance) UpdateServers() {
if i.Debug { if i.Debug {
fmt.Println("\nScraping servers...") fmt.Println("\nScraping servers...")
} }
scraped, err := ScrapePage() scraped, err := i.ScrapePage()
if !log_error(err) { if !log_error(err) {
for _, s := range scraped { for _, s := range scraped {
i.update_server(tx, s) i.update_server(tx, s)
@ -99,7 +99,7 @@ func (i *Instance) update_server(tx *DB, s *RawServerData) {
return return
} }
if IsDebugging() { if i.Debug {
fmt.Println(s.Title) fmt.Println(s.Title)
} }

11
src/utils.go
View File

@ -6,8 +6,7 @@ import (
) )
var ( var (
now = time.Now() now = time.Now()
debugging bool = false
) )
func log_error(err error) bool { 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() { func ResetNow() {
now = time.Now() now = time.Now()
} }

1
src/web.go
View File

@ -11,7 +11,6 @@ import (
func (i *Instance) Init() { func (i *Instance) Init() {
i.DB.InitSchema() i.DB.InitSchema()
SetDebug(i.Debug) // TODO: get rid of this stupid debug thing
} }
func (i *Instance) Serve(addr string) error { func (i *Instance) Serve(addr string) error {