refactor

xjasonlyu · Aug 21, 2024 · aefc33c · aefc33c
1 parent a519874
commit aefc33c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 361 deletions.
diff --git a/common/observable/iterable.go b/common/observable/iterable.go
diff --git a/common/observable/observable.go b/common/observable/observable.go
diff --git a/common/observable/observable_test.go b/common/observable/observable_test.go
diff --git a/common/observable/subscriber.go b/common/observable/subscriber.go
diff --git a/log/event.go b/log/event.go
diff --git a/log/log.go b/log/log.go
@@ -3,6 +3,7 @@ package log
 import (
 	"io"
 	"os"
+	"time"
 
 	"github.com/sirupsen/logrus"
 	"go.uber.org/atomic"
@@ -45,19 +46,16 @@ func Fatalf(format string, args ...any) {
 }
 
 func logf(level Level, format string, args ...any) {
-	event := newEvent(level, format, args...)
-	if uint32(event.Level) > _defaultLevel.Load() {
-		return
-	}
-
 	switch level {
 	case DebugLevel:
-		logrus.WithTime(event.Time).Debugln(event.Message)
+		logrus.WithTime(time.Now()).Debugf(format, args...)
 	case InfoLevel:
-		logrus.WithTime(event.Time).Infoln(event.Message)
+		logrus.WithTime(time.Now()).Infof(format, args...)
 	case WarnLevel:
-		logrus.WithTime(event.Time).Warnln(event.Message)
+		logrus.WithTime(time.Now()).Warnf(format, args...)
 	case ErrorLevel:
-		logrus.WithTime(event.Time).Errorln(event.Message)
+		logrus.WithTime(time.Now()).Errorf(format, args...)
+	default:
+		// nop
 	}
 }
diff --git a/restapi/connections.go b/restapi/connections.go
@@ -17,7 +17,7 @@ import (
 const defaultInterval = 1000
 
 func init() {
-	registerMountPoint("/connections", connectionRouter())
+	registerEndpoint("/connections", connectionRouter())
 }
 
 func connectionRouter() http.Handler {

diff --git a/restapi/debug.go b/restapi/debug.go
@@ -10,7 +10,7 @@ import (
 )
 
 func init() {
-	registerMountPoint("/debug/pprof/", pprofRouter())
+	registerEndpoint("/debug/pprof/", pprofRouter())
 }
 
 func pprofRouter() http.Handler {

diff --git a/restapi/netstats.go b/restapi/netstats.go
@@ -19,7 +19,7 @@ func SetStatsFunc(s func() tcpip.Stats) {
 }
 
 func init() {
-	registerMountPoint("/netstats", http.HandlerFunc(getNetStats))
+	registerEndpoint("/netstats", http.HandlerFunc(getNetStats))
 }
 
 func getNetStats(w http.ResponseWriter, r *http.Request) {