Merge main into sweep/real-time-status-updates

2 years ago · d6e97821d9
parent 6f1b1df422 7994b377f7
commit d6e97821d9
2 changed files with 3 additions and 2 deletions
--- a/pkg/common/db/unrelation/msg.go
+++ b/pkg/common/db/unrelation/msg.go
@ -19,9 +19,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/OpenIMSDK/tools/log"
 	"time"

+	"github.com/OpenIMSDK/tools/log"
+
 	"github.com/OpenIMSDK/protocol/msg"

 	"github.com/OpenIMSDK/protocol/constant"
--- a/tools/component/main.go
+++ b/tools/component/main.go
@ -29,7 +29,7 @@ import (
 )

 const (
-	cfgPath                  = "../../config/config.yaml"
+	cfgPath                  = "../../../../../config/config.yaml"
 	minioHealthCheckDuration = 1
 	maxRetry                 = 100
 	componentStartErrCode    = 6000