From 5e30ecd44bd3a5c38a56b6962d129ddcb7ed82f4 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 4 May 2019 18:03:13 +0200
Subject: [PATCH] Switch logger
---
client.go | 18 +++++++++---------
go.mod | 2 +-
go.sum | 7 +------
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/client.go b/client.go
index 5a961d0..6a896bd 100644
--- a/client.go
+++ b/client.go
@@ -2,7 +2,7 @@ package bahn
import (
"fmt"
- "github.com/google/logger"
+ "github.com/golang/glog"
"golang.org/x/net/html/charset"
"io"
"io/ioutil"
@@ -49,7 +49,7 @@ func (c *ApiClient) Station(evaId int64) ([]Station, error) {
func (c *ApiClient) loadStation(evaId int64) ([]Station, error) {
var err error
uri := fmt.Sprintf("%s/timetable/station/%d", c.IrisBaseUrl, evaId)
- logger.Infof("Loading Station %d", evaId)
+ glog.Infof("Loading Station %d", evaId)
var stations []Station
@@ -98,7 +98,7 @@ func (c *ApiClient) loadTimetable(evaId int64, date time.Time) (Timetable, error
BahnFormat := "060102/15"
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))
+ glog.Infof("Loading Timetable %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable
@@ -146,7 +146,7 @@ func (c *ApiClient) loadRealtimeAll(evaId int64, date time.Time) (Timetable, err
var err error
uri := fmt.Sprintf("%s/timetable/fchg/%d", c.IrisBaseUrl, evaId)
- logger.Infof("Loading RealtimeAll %d %s", evaId, date.Format(time.RFC3339))
+ glog.Infof("Loading RealtimeAll %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable
@@ -194,7 +194,7 @@ func (c *ApiClient) loadRealtimeRecent(evaId int64, date time.Time) (Timetable,
var err error
uri := fmt.Sprintf("%s/timetable/rchg/%d", c.IrisBaseUrl, evaId)
- logger.Infof("Loading RealtimeRecent %d %s", evaId, date.Format(time.RFC3339))
+ glog.Infof("Loading RealtimeRecent %d %s", evaId, date.Format(time.RFC3339))
var timetable Timetable
@@ -242,7 +242,7 @@ func (c *ApiClient) loadWingDefinition(parent string, wing string) (WingDefiniti
var err error
uri := fmt.Sprintf("%s/timetable/wingdef/%s/%s", c.IrisBaseUrl, parent, wing)
- logger.Infof("Loading WingDefinition %s %s", parent, wing)
+ glog.Infof("Loading WingDefinition %s %s", parent, wing)
var wingDefinition WingDefinition
@@ -290,7 +290,7 @@ func (c *ApiClient) loadCoachSequence(line string, date time.Time) (CoachSequenc
var err error
uri := fmt.Sprintf("%s/%s/%s", c.CoachSequenceBaseUrl, line, date.Format(TimeLayoutShort))
- logger.Infof("Loading CoachSequence %s %s", line, date.Format(time.RFC3339))
+ glog.Infof("Loading CoachSequence %s %s", line, date.Format(time.RFC3339))
var coachSequence CoachSequence
@@ -338,7 +338,7 @@ func (c *ApiClient) loadSuggestions(line string, date time.Time) ([]Suggestion,
var err error
uri := fmt.Sprintf("%s/trainsearch.exe/dn", c.HafasBaseUrl)
- logger.Infof("Loading Suggestions %s %s", line, date.Format(time.RFC3339))
+ glog.Infof("Loading Suggestions %s %s", line, date.Format(time.RFC3339))
var suggestions []Suggestion
@@ -407,7 +407,7 @@ func (c *ApiClient) loadHafasMessages(trainlink string) ([]HafasMessage, error)
var err error
uri := fmt.Sprintf("%s/traininfo.exe/dn/%s?rt=1&ajax=1", c.HafasBaseUrl, trainlink)
- logger.Infof("Loading HafasMessages %s", trainlink)
+ glog.Infof("Loading HafasMessages %s", trainlink)
var messages []HafasMessage
request, err := http.NewRequest("GET", uri, nil)
diff --git a/go.mod b/go.mod
index 709bfdd..f03be35 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.12
require (
github.com/andybalholm/cascadia v1.0.0
- github.com/google/logger v1.0.1
+ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01
golang.org/x/text v0.3.2 // indirect
gopkg.in/yaml.v2 v2.2.2
diff --git a/go.sum b/go.sum
index d4ced93..9fdb482 100644
--- a/go.sum
+++ b/go.sum
@@ -1,12 +1,7 @@
-github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
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=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
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/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--
GitLab