Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: unifies legacy log organization info #7618

Merged
merged 1 commit into from
Jul 30, 2024
Merged

feat: unifies legacy log organization info #7618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions server/controller/grpc/statsd/statsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@ package statsd
import (
"sync/atomic"

logging "github.com/op/go-logging"

"github.com/deepflowio/deepflow/server/controller/logger"
"github.com/deepflowio/deepflow/server/libs/stats"
)

var log = logging.MustGetLogger("trisolaris/statsd")
var log = logger.MustGetLogger("trisolaris/statsd")

type Counter struct {
ReqCount uint64 `statsd:"req_count"`
Expand Down
8 changes: 4 additions & 4 deletions server/controller/http/service/resource/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"strings"
"time"

logging "github.com/op/go-logging"
uuid "github.com/satori/go.uuid"
"gorm.io/gorm/clause"

Expand All @@ -39,13 +38,14 @@ import (
routercommon "github.com/deepflowio/deepflow/server/controller/http/router/common"
svc "github.com/deepflowio/deepflow/server/controller/http/service"
servicecommon "github.com/deepflowio/deepflow/server/controller/http/service/common"
"github.com/deepflowio/deepflow/server/controller/logger"
"github.com/deepflowio/deepflow/server/controller/model"
"github.com/deepflowio/deepflow/server/controller/recorder/constraint"
"github.com/deepflowio/deepflow/server/controller/recorder/pubsub/message"
"github.com/deepflowio/deepflow/server/controller/tagrecorder"
)

var log = logging.MustGetLogger("service.resource")
var log = logger.MustGetLogger("service.resource")

var DOMAIN_PASSWORD_KEYS = map[string]bool{
"admin_password": false,
Expand Down Expand Up @@ -1066,7 +1066,7 @@ func (c *DomainChecker) CheckRegularly(sCtx context.Context) {
}

func (c *DomainChecker) checkAndAllocateController(db *mysql.DB) {
log.Infof("check domain controller health started", db.LogPrefixORGID)
log.Info("check domain controller health started", db.LogPrefixORGID)
controllerIPToRegionLcuuid := make(map[string]string)
var azCConns []*mysql.AZControllerConnection
db.Find(&azCConns)
Expand Down Expand Up @@ -1107,5 +1107,5 @@ func (c *DomainChecker) checkAndAllocateController(db *mysql.DB) {
}
}
}
log.Infof("check domain controller health ended", db.LogPrefixORGID)
log.Info("check domain controller health ended", db.LogPrefixORGID)
}
4 changes: 2 additions & 2 deletions server/controller/http/service/vtap/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package vtap
import (
"fmt"

logging "github.com/op/go-logging"
"github.com/deepflowio/deepflow/server/controller/logger"
)

var log = logging.MustGetLogger("http.service.vtap")
var log = logger.MustGetLogger("http.service.vtap")

func dbQueryResourceFailed(resource string, err error) string {
return fmt.Sprintf("db query %s failed: %v", resource, err)
Expand Down
2 changes: 1 addition & 1 deletion server/controller/http/service/vtap/vtap_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (v *VTapInterface) getRawVTapVinterfacesByRegion(host string, port int, que
return simplejson.New()
}
if len(resp.Get("DATA").MustArray()) == 0 {
log.Warningf("no data in curl response", v.db.LogPrefixORGID)
log.Warning("no data in curl response", v.db.LogPrefixORGID)
return simplejson.New()
}
return resp.Get("DATA")
Expand Down
5 changes: 2 additions & 3 deletions server/controller/monitor/license/pseudo_license.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@ import (
"strings"
"time"

logging "github.com/op/go-logging"

"github.com/deepflowio/deepflow/server/controller/common"
"github.com/deepflowio/deepflow/server/controller/db/mysql"
"github.com/deepflowio/deepflow/server/controller/logger"
"github.com/deepflowio/deepflow/server/controller/monitor/config"
)

var log = logging.MustGetLogger("monitor.license")
var log = logger.MustGetLogger("monitor.license")

var VTAP_LICENSE_TYPE_DEFAULT = common.VTAP_LICENSE_TYPE_A
var VTAP_LICENSE_FUNCTIONS = []string{
Expand Down
3 changes: 1 addition & 2 deletions server/controller/tagrecorder/check/tagrecorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"sync"
"time"

logging "github.com/op/go-logging"
"gorm.io/gorm"
"gorm.io/gorm/clause"

Expand All @@ -37,7 +36,7 @@ import (
)

var (
log = logging.MustGetLogger("tagrecorder/check")
log = logger.MustGetLogger("tagrecorder/check")

tagRecorderOnce sync.Once
tagRecorder *TagRecorder
Expand Down
5 changes: 2 additions & 3 deletions server/controller/tagrecorder/tagrecorder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ import (
"context"
"sync"

logging "github.com/op/go-logging"

"github.com/deepflowio/deepflow/server/controller/config"
"github.com/deepflowio/deepflow/server/controller/logger"
)

var log = logging.MustGetLogger("tagrecorder")
var log = logger.MustGetLogger("tagrecorder")

var (
tagRecorderOnce sync.Once
Expand Down
Loading