diff --git a/agent/utils/common/sqlite.go b/agent/utils/common/sqlite.go index 18a8bf7a3596..22eb8ec4515f 100644 --- a/agent/utils/common/sqlite.go +++ b/agent/utils/common/sqlite.go @@ -5,7 +5,6 @@ import ( "log" "os" "path" - "strings" "time" "github.com/1Panel-dev/1Panel/agent/global" @@ -68,9 +67,6 @@ func GetDBWithPath(dbPath string) (*gorm.DB, error) { if err != nil { return nil, err } - if strings.HasSuffix(dbPath, "core.db") || strings.HasSuffix(dbPath, "agent.db") { - initializeTxWatch(db) - } sqlDB, dbError := db.DB() if dbError != nil { return nil, dbError diff --git a/agent/utils/common/sqlite_tx_logs.go b/agent/utils/common/sqlite_tx_logs.go deleted file mode 100644 index 6482a17544e7..000000000000 --- a/agent/utils/common/sqlite_tx_logs.go +++ /dev/null @@ -1,67 +0,0 @@ -package common - -import ( - "context" - "fmt" - "runtime" - "strings" - "time" - - "github.com/1Panel-dev/1Panel/agent/global" - "gorm.io/gorm" -) - -type contextKey string - -func initializeTxWatch(db *gorm.DB) { - _ = db.Callback().Create().Before("gorm:begin_transaction").Register( - "my_plugin:before_begin", - func(db *gorm.DB) { - var caller []string - for i := 0; ; i++ { - pc, file, line, ok := runtime.Caller(i) - if !ok { - break - } - funcName := runtime.FuncForPC(pc).Name() - if !strings.HasPrefix(funcName, "github.com/1Panel-dev/1Panel") { - continue - } - fileParts := strings.Split(file, "/") - fileName := fileParts[len(fileParts)-1] - caller = append(caller, fmt.Sprintf("%s/%s:%d", funcName, fileName, line)) - } - txID := generateTransactionID() - db.Statement.Context = context.WithValue( - db.Statement.Context, - contextKey("tx_id"), txID, - ) - db.Statement.Context = context.WithValue( - db.Statement.Context, - contextKey("tx_start"), time.Now(), - ) - global.LOG.Debugf("[%s] tx start \n%s", txID, strings.Join(caller, "\n")) - }, - ) - - _ = db.Callback().Create().After("gorm:commit_or_rollback_transaction").Register( - "my_plugin:after_commit_or_rollback", - func(db *gorm.DB) { - ctx := db.Statement.Context - txID, _ := ctx.Value(contextKey("tx_id")).(string) - startTime, _ := ctx.Value(contextKey("tx_start")).(time.Time) - if txID != "" { - duration := time.Since(startTime) - if db.Error != nil { - global.LOG.Debugf("[%s] tx rollback! time: %v, err: %v", txID, duration, db.Error) - } else { - global.LOG.Debugf("[%s] tx commit! time: %v", txID, duration) - } - } - }, - ) -} - -func generateTransactionID() string { - return fmt.Sprintf("tx_%d", time.Now().UnixNano()) -} diff --git a/frontend/src/xpack-ee b/frontend/src/xpack-ee new file mode 160000 index 000000000000..329f2b121b9c --- /dev/null +++ b/frontend/src/xpack-ee @@ -0,0 +1 @@ +Subproject commit 329f2b121b9cbe556ac8abe323d8cac273263f61