jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-05-28 06:37:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix non-json logs with log_as_json enabled (#3779)

Browse Source 
Signed-off-by: CH3CHO <ch3cho@qq.com>
This commit is contained in:
Kent Dong
2026-04-30 18:03:33 +08:00
committed by GitHub
parent 74c68180c8
commit 4e0d691432
14 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
registry/consul/watcher.go
View File

@@ -23,7 +23,7 @@ import (
consulapi "github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"

3
registry/direct/watcher.go
View File

@@ -22,7 +22,7 @@ import (
"sync"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"
@@ -268,4 +268,3 @@ func (w *watcher) getSni(se *v1alpha3.ServiceEntry) string {
func (w *watcher) GetRegistryType() string {
return w.RegistryConfig.Type
}

2
registry/eureka/client/http_client.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/avast/retry-go/v4"
"github.com/hudl/fargo"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
)
var httpClient = http.DefaultClient

2
registry/eureka/client/plan.go
View File

@@ -16,7 +16,7 @@ package client
import (
"github.com/hudl/fargo"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
)
type Handler func(application *fargo.Application) error

2
registry/eureka/watcher.go
View File

@@ -23,7 +23,7 @@ import (
"github.com/hudl/fargo"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"

2
registry/memory/cache.go
View File

@@ -28,7 +28,7 @@ import (
"istio.io/api/networking/v1alpha3"
"istio.io/istio/pkg/config"
"istio.io/istio/pkg/config/schema/gvk"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
"github.com/alibaba/higress/v2/pkg/common"
higressconfig "github.com/alibaba/higress/v2/pkg/config"

2
registry/nacos/address/address_discovery.go
View File

@@ -25,7 +25,7 @@ import (
"time"
"go.uber.org/atomic"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
)
const (

2
registry/nacos/v2/watcher.go
View File

@@ -32,7 +32,7 @@ import (
"github.com/nacos-group/nacos-sdk-go/v2/vo"
"go.uber.org/atomic"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"

2
registry/nacos/watcher.go
View File

@@ -27,7 +27,7 @@ import (
"github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"

2
registry/reconcile/reconcile.go
View File

@@ -23,7 +23,7 @@ import (
"sync"
"time"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"

2
registry/watcher.go
View File

@@ -21,7 +21,7 @@ import (
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
)
const (

4
registry/zookeeper/watcher.go
View File

@@ -30,7 +30,7 @@ import (
"github.com/hashicorp/go-multierror"
"go.uber.org/atomic"
"istio.io/api/networking/v1alpha3"
"istio.io/pkg/log"
"istio.io/istio/pkg/log"
apiv1 "github.com/alibaba/higress/v2/api/networking/v1"
"github.com/alibaba/higress/v2/pkg/common"
@@ -665,7 +665,7 @@ func (w *watcher) Run() {
defer func() {
log.Info("[zookeeper] Run is down")
if r := recover(); r != nil {
log.Info("Recovered in f", "r is", r)
log.Infof("Recovered in Run: %v", r)
}
}()
ticker := time.NewTicker(30 * time.Second)