Beautify logs with xlog

This commit is contained in:
Andreas Neue
2016-03-12 13:09:25 +01:00
parent 13379b29ea
commit 1dea72f6c7
11 changed files with 60 additions and 48 deletions
+11 -10
View File
@@ -7,13 +7,14 @@ import (
"fmt"
"html"
"io/ioutil"
"log"
"net/http"
"net/url"
"regexp"
"strings"
"time"
"code.dnix.de/an/xlog"
"flokatirc/util"
"github.com/sorcix/irc"
@@ -48,8 +49,8 @@ var (
func init() {
MsgHandlers["sc"] = scHandleMessage
log.Println("Initializing sc module")
go scScrapeLoop()
xlog.Info("SC module initialized")
}
func scHandleMessage(m *irc.Message) {
@@ -82,22 +83,22 @@ func scScrapeLoop() {
func scScraper() {
var data interface{}
log.Println("Scraping SC stats")
xlog.Info("Scraping SC stats")
resp, err := http.PostForm(API_URL+API_METHOD,
url.Values{"fans": {"true"}, "fleet": {"true"}, "funds": {"true"}})
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
err = json.Unmarshal(body, &data)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
stats := data.(map[string]interface{})["data"].(map[string]interface{})
@@ -135,13 +136,13 @@ func showScStats() {
func showCitizen(handle string) {
resp, err := http.Get(QUERY_CIT_URL + handle)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
reName := regexp.MustCompile(RE_CIT_NAME)
@@ -175,13 +176,13 @@ func showCitizen(handle string) {
func showOrganization(handle string) {
resp, err := http.Get(QUERY_ORG_URL + handle)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Error: %v", err)
xlog.Info("Error: %v", err)
return
}
reName := regexp.MustCompile(RE_ORG_NAME)