DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix log output format

Browse source 
Signed-off-by: Zhenhai Gao <gaozh1988@live.com>
This commit is contained in:
Zhenhai Gao 2018-12-05 13:17:17 +08:00
parent f5d2fa19aa
commit 05d2baede6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ingress/controller/tcp.go
View file

@ -63,7 +63,7 @@ func (p *TCPProxy) Handle(conn net.Conn) {
length, err := conn.Read(data) length, err := conn.Read(data)
if err != nil { if err != nil {
klog.V(4).Infof("Error reading the first 4k of the connection: %s", err) klog.V(4).Infof("Error reading the first 4k of the connection: %v", err)
return return
} }
@ -75,7 +75,7 @@ func (p *TCPProxy) Handle(conn net.Conn) {
} }
if proxy == nil { if proxy == nil {
klog.V(4).Infof("There is no configured proxy for SSL connections.") klog.V(4).Info("There is no configured proxy for SSL connections.")
return return
} }
@ -100,12 +100,12 @@ func (p *TCPProxy) Handle(conn net.Conn) {
_, err = fmt.Fprintf(clientConn, proxyProtocolHeader) _, err = fmt.Fprintf(clientConn, proxyProtocolHeader)
} }
if err != nil { if err != nil {
klog.Errorf("Error writing Proxy Protocol header: %s", err) klog.Errorf("Error writing Proxy Protocol header: %v", err)
clientConn.Close() clientConn.Close()
} else { } else {
_, err = clientConn.Write(data[:length]) _, err = clientConn.Write(data[:length])
if err != nil { if err != nil {
klog.Errorf("Error writing the first 4k of proxy data: %s", err) klog.Errorf("Error writing the first 4k of proxy data: %v", err)
clientConn.Close() clientConn.Close()
} }
} }

6
internal/net/ssl/ssl.go
View file

@ -432,7 +432,7 @@ func GetFakeSSLCert() ([]byte, []byte) {
priv, err = rsa.GenerateKey(rand.Reader, 2048) priv, err = rsa.GenerateKey(rand.Reader, 2048)
if err != nil { if err != nil {
klog.Fatalf("failed to generate fake private key: %s", err) klog.Fatalf("failed to generate fake private key: %v", err)
} }
notBefore := time.Now() notBefore := time.Now()
@ -443,7 +443,7 @@ func GetFakeSSLCert() ([]byte, []byte) {
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
if err != nil { if err != nil {
klog.Fatalf("failed to generate fake serial number: %s", err) klog.Fatalf("failed to generate fake serial number: %v", err)
} }
template := x509.Certificate{ template := x509.Certificate{
@ -462,7 +462,7 @@ func GetFakeSSLCert() ([]byte, []byte) {
} }
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.(*rsa.PrivateKey).PublicKey, priv) derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.(*rsa.PrivateKey).PublicKey, priv)
if err != nil { if err != nil {
klog.Fatalf("Failed to create fake certificate: %s", err) klog.Fatalf("Failed to create fake certificate: %v", err)
} }
cert := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes}) cert := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})