Commit 292c29ec authored by Aaron3S's avatar Aaron3S
Browse files

fix(log): 移除无用log

parent ffc10c98
Showing with 33 additions and 2 deletions
+33 -2
...@@ -8,7 +8,8 @@ require ( ...@@ -8,7 +8,8 @@ require (
github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/etcd v3.3.13+incompatible github.com/coreos/etcd v3.3.13+incompatible
github.com/creack/pty v1.1.15 // indirect github.com/creack/pty v1.1.15 // indirect
github.com/go-ldap/ldap v3.0.3+incompatible // indirect github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-logr/logr v0.4.0
github.com/gofrs/flock v0.8.1 github.com/gofrs/flock v0.8.1
github.com/google/go-cmp v0.5.6 // indirect github.com/google/go-cmp v0.5.6 // indirect
github.com/google/uuid v1.2.0 github.com/google/uuid v1.2.0
...@@ -29,6 +30,7 @@ require ( ...@@ -29,6 +30,7 @@ require (
k8s.io/apimachinery v0.22.1 k8s.io/apimachinery v0.22.1
k8s.io/cli-runtime v0.22.1 k8s.io/cli-runtime v0.22.1
k8s.io/client-go v0.22.1 k8s.io/client-go v0.22.1
k8s.io/klog/v2 v2.9.0
) )
replace github.com/KubeOperator/webkubectl/gotty v0.0.0-20210927072155-e9ce79172471 => ./thirdparty/gotty replace github.com/KubeOperator/webkubectl/gotty v0.0.0-20210927072155-e9ce79172471 => ./thirdparty/gotty
...@@ -4,6 +4,8 @@ import ( ...@@ -4,6 +4,8 @@ import (
"embed" "embed"
"fmt" "fmt"
v1 "github.com/KubeOperator/kubepi/internal/model/v1" v1 "github.com/KubeOperator/kubepi/internal/model/v1"
"github.com/go-logr/logr"
"k8s.io/klog/v2"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
"net/url" "net/url"
...@@ -86,7 +88,34 @@ func (e *KubePiSerer) setUpConfig() { ...@@ -86,7 +88,34 @@ func (e *KubePiSerer) setUpConfig() {
} }
} }
type TodoLogger struct {
}
func (t TodoLogger) Enabled() bool {
return true
}
func (t TodoLogger) Info(msg string, keysAndValues ...interface{}) {
}
func (t TodoLogger) Error(err error, msg string, keysAndValues ...interface{}) {
}
func (t TodoLogger) V(level int) logr.Logger {
return nil
}
func (t TodoLogger) WithValues(keysAndValues ...interface{}) logr.Logger {
return nil
}
func (t TodoLogger) WithName(name string) logr.Logger {
return nil
}
func (e *KubePiSerer) setUpLogger() { func (e *KubePiSerer) setUpLogger() {
klog.SetLogger(TodoLogger{})
e.logger = logrus.New() e.logger = logrus.New()
l, err := logrus.ParseLevel(e.config.Spec.Logger.Level) l, err := logrus.ParseLevel(e.config.Spec.Logger.Level)
if err != nil { if err != nil {
......
...@@ -147,7 +147,7 @@ func (sm *SessionMap) Close(sessionId string, status uint32, reason string) { ...@@ -147,7 +147,7 @@ func (sm *SessionMap) Close(sessionId string, status uint32, reason string) {
sm.Lock.Lock() sm.Lock.Lock()
defer sm.Lock.Unlock() defer sm.Lock.Unlock()
err := sm.Sessions[sessionId].sockJSSession.Close(status, reason) err := sm.Sessions[sessionId].sockJSSession.Close(status, reason)
if err != nil { if err != nil && status != 1 {
log.Println(err) log.Println(err)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment