Skip to content
Snippets Groups Projects
Commit 57376b19 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Implement logging

parent 3f674159
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package bahn ...@@ -2,6 +2,7 @@ package bahn
import ( import (
"fmt" "fmt"
"github.com/google/logger"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
"io" "io"
"io/ioutil" "io/ioutil"
...@@ -47,8 +48,8 @@ func (c *ApiClient) Station(evaId int64) ([]Station, error) { ...@@ -47,8 +48,8 @@ func (c *ApiClient) Station(evaId int64) ([]Station, error) {
func (c *ApiClient) loadStation(evaId int64) ([]Station, error) { func (c *ApiClient) loadStation(evaId int64) ([]Station, error) {
var err error var err error
uri := fmt.Sprintf("%s/timetable/station/%d", c.IrisBaseUrl, evaId) uri := fmt.Sprintf("%s/timetable/station/%d", c.IrisBaseUrl, evaId)
logger.Infof("Loading Station %d", evaId)
var stations []Station var stations []Station
...@@ -97,6 +98,7 @@ func (c *ApiClient) loadTimetable(evaId int64, date time.Time) (Timetable, error ...@@ -97,6 +98,7 @@ func (c *ApiClient) loadTimetable(evaId int64, date time.Time) (Timetable, error
BahnFormat := "060102/15" BahnFormat := "060102/15"
uri := fmt.Sprintf("%s/timetable/plan/%d/%s", c.IrisBaseUrl, evaId, date.Format(BahnFormat)) uri := fmt.Sprintf("%s/timetable/plan/%d/%s", c.IrisBaseUrl, evaId, date.Format(BahnFormat))
logger.Infof("Loading Timetable %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable var timetable Timetable
...@@ -144,6 +146,7 @@ func (c *ApiClient) loadRealtimeAll(evaId int64, date time.Time) (Timetable, err ...@@ -144,6 +146,7 @@ func (c *ApiClient) loadRealtimeAll(evaId int64, date time.Time) (Timetable, err
var err error var err error
uri := fmt.Sprintf("%s/timetable/fchg/%d", c.IrisBaseUrl, evaId) uri := fmt.Sprintf("%s/timetable/fchg/%d", c.IrisBaseUrl, evaId)
logger.Infof("Loading RealtimeAll %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable var timetable Timetable
...@@ -191,6 +194,7 @@ func (c *ApiClient) loadRealtimeRecent(evaId int64, date time.Time) (Timetable, ...@@ -191,6 +194,7 @@ func (c *ApiClient) loadRealtimeRecent(evaId int64, date time.Time) (Timetable,
var err error var err error
uri := fmt.Sprintf("%s/timetable/rchg/%d", c.IrisBaseUrl, evaId) uri := fmt.Sprintf("%s/timetable/rchg/%d", c.IrisBaseUrl, evaId)
logger.Infof("Loading RealtimeRecent %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable var timetable Timetable
...@@ -238,6 +242,7 @@ func (c *ApiClient) loadWingDefinition(parent string, wing string) (WingDefiniti ...@@ -238,6 +242,7 @@ func (c *ApiClient) loadWingDefinition(parent string, wing string) (WingDefiniti
var err error var err error
uri := fmt.Sprintf("%s/timetable/wingdef/%s/%s", c.IrisBaseUrl, parent, wing) uri := fmt.Sprintf("%s/timetable/wingdef/%s/%s", c.IrisBaseUrl, parent, wing)
logger.Infof("Loading WingDefinition %s %s", parent, wing)
var wingDefinition WingDefinition var wingDefinition WingDefinition
...@@ -285,6 +290,7 @@ func (c *ApiClient) loadCoachSequence(line string, date time.Time) (CoachSequenc ...@@ -285,6 +290,7 @@ func (c *ApiClient) loadCoachSequence(line string, date time.Time) (CoachSequenc
var err error var err error
uri := fmt.Sprintf("%s/%s/%s", c.CoachSequenceBaseUrl, line, date.Format(TimeLayoutShort)) uri := fmt.Sprintf("%s/%s/%s", c.CoachSequenceBaseUrl, line, date.Format(TimeLayoutShort))
logger.Infof("Loading CoachSequence %s %s", line, date.Format(time.RFC3339))
var coachSequence CoachSequence var coachSequence CoachSequence
...@@ -332,6 +338,7 @@ func (c *ApiClient) loadSuggestions(line string, date time.Time) ([]Suggestion, ...@@ -332,6 +338,7 @@ func (c *ApiClient) loadSuggestions(line string, date time.Time) ([]Suggestion,
var err error var err error
uri := fmt.Sprintf("%s/trainsearch.exe/dn", c.HafasBaseUrl) uri := fmt.Sprintf("%s/trainsearch.exe/dn", c.HafasBaseUrl)
logger.Infof("Loading CoachSequence %s %s", line, date.Format(time.RFC3339))
var suggestions []Suggestion var suggestions []Suggestion
...@@ -400,6 +407,7 @@ func (c *ApiClient) loadHafasMessages(trainlink string) ([]HafasMessage, error) ...@@ -400,6 +407,7 @@ func (c *ApiClient) loadHafasMessages(trainlink string) ([]HafasMessage, error)
var err error var err error
uri := fmt.Sprintf("%s/traininfo.exe/dn/%s?rt=1&ajax=1", c.HafasBaseUrl, trainlink) uri := fmt.Sprintf("%s/traininfo.exe/dn/%s?rt=1&ajax=1", c.HafasBaseUrl, trainlink)
logger.Infof("Loading HafasMessages %s", trainlink)
var messages []HafasMessage var messages []HafasMessage
request, err := http.NewRequest("GET", uri, nil) request, err := http.NewRequest("GET", uri, nil)
......
...@@ -4,6 +4,7 @@ go 1.12 ...@@ -4,6 +4,7 @@ go 1.12
require ( require (
github.com/andybalholm/cascadia v1.0.0 github.com/andybalholm/cascadia v1.0.0
github.com/google/logger v1.0.1
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01
golang.org/x/text v0.3.2 // indirect golang.org/x/text v0.3.2 // indirect
gopkg.in/yaml.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.2
......
github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
github.com/google/logger v1.0.1/go.mod h1:w7O8nrRr0xufejBlQMI83MXqRusvREoJdaAxV+CoAB4=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01 h1:po1f06KS05FvIQQA2pMuOWZAUXiy1KYdIf0ElUU2Hhc=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment