homelab/traefik
1
0
Fork 0
Code Activity

fix: logger and context.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-09-13 19:28:04 +02:00 • committed by Traefiker Bot
parent b4c7b90c9e
commit 8e18d37b3d
52 changed files with 231 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

8
integration/access_log_test.go
View file

@ -46,7 +46,7 @@ func (s *AccessLogSuite) SetUpSuite(c *check.C) {
func (s *AccessLogSuite) TearDownTest(c *check.C) {
displayTraefikLogFile(c, traefikTestLogFile)
os.Remove(traefikTestAccessLogFile)
_ = os.Remove(traefikTestAccessLogFile)
}
func (s *AccessLogSuite) TestAccessLog(c *check.C) {
@ -59,7 +59,7 @@ func (s *AccessLogSuite) TestAccessLog(c *check.C) {
defer func() {
traefikLog, err := ioutil.ReadFile(traefikTestLogFile)
c.Assert(err, checker.IsNil)
log.Info(string(traefikLog))
log.WithoutContext().Info(string(traefikLog))
}()
err := cmd.Start()
@ -233,7 +233,7 @@ func digestParts(resp *http.Response) map[string]string {
func getMD5(data string) string {
digest := md5.New()
if _, err := digest.Write([]byte(data)); err != nil {
log.Error(err)
log.WithoutContext().Error(err)
}
return fmt.Sprintf("%x", digest.Sum(nil))
}
@ -241,7 +241,7 @@ func getMD5(data string) string {
func getCnonce() string {
b := make([]byte, 8)
if _, err := io.ReadFull(rand.Reader, b); err != nil {
log.Error(err)
log.WithoutContext().Error(err)
}
return fmt.Sprintf("%x", b)[:16]
}

11
integration/fake_dns_server.go
View file

@ -15,6 +15,8 @@ type handler struct{}
// Simplified version of the Challenge Test Server from Boulder
// https://github.com/letsencrypt/boulder/blob/a6597b9f120207eff192c3e4107a7e49972a0250/test/challtestsrv/dnsone.go#L40
func (s *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
logger := log.WithoutContext()
m := new(dns.Msg)
m.SetReply(r)
m.Compress = false
@ -23,8 +25,9 @@ func (s *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
if fakeDNS == "" {
fakeDNS = "127.0.0.1"
}
for _, q := range r.Question {
log.Infof("Query -- [%s] %s", q.Name, dns.TypeToString[q.Qtype])
logger.Infof("Query -- [%s] %s", q.Name, dns.TypeToString[q.Qtype])
switch q.Qtype {
case dns.TypeA:
@ -94,7 +97,7 @@ func (s *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
m.Ns = append(m.Ns, auth)
if err := w.WriteMsg(m); err != nil {
log.Fatalf("Failed to write message %v", err)
logger.Fatalf("Failed to write message %v", err)
}
}
@ -106,9 +109,9 @@ func startFakeDNSServer() *dns.Server {
}
go func() {
log.Infof("Start a fake DNS server.")
log.WithoutContext().Infof("Start a fake DNS server.")
if err := srv.ListenAndServe(); err != nil {
log.Fatalf("Failed to set udp listener %v", err)
log.WithoutContext().Fatalf("Failed to set udp listener %v", err)
}
}()

2
integration/grpc_test.go
View file

@ -50,7 +50,7 @@ func (s *myserver) StreamExample(in *helloworld.StreamExampleRequest, server hel
}
if err := server.Send(&helloworld.StreamExampleReply{Data: string(data)}); err != nil {
log.Error(err)
log.WithoutContext().Error(err)
}
<-s.stopStreamExample

4
integration/integration_test.go
View file

@ -28,7 +28,7 @@ var showLog = flag.Bool("tlog", false, "always show Traefik logs")
func Test(t *testing.T) {
if !*integration {
log.Info("Integration tests disabled.")
log.WithoutContext().Info("Integration tests disabled.")
return
}
@ -91,7 +91,7 @@ func (s *BaseSuite) createComposeProject(c *check.C, name string) {
ip, _, err := net.ParseCIDR(addr.String())
c.Assert(err, checker.IsNil)
if !ip.IsLoopback() && ip.To4() != nil {
os.Setenv("DOCKER_HOST_IP", ip.String())
_ = os.Setenv("DOCKER_HOST_IP", ip.String())
break
}
}