blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-03 02:42:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: fix openim logs and ci

Browse Source
This commit is contained in:
Xinwei Xiong (cubxxw) 2024-02-04 11:04:54 +08:00
commit 38f9a828af
29 changed files with 112 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/openim-api/main.go
View File

@ -17,7 +17,6 @@ package main
import (
"context"
"fmt"
"github.com/OpenIMSDK/tools/errs"
"net"
"net/http"
_ "net/http/pprof"
@ -27,8 +26,11 @@ import (
"syscall"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/tools/discoveryregistry"
"github.com/openimsdk/open-im-server/v3/internal/api"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-cmdutils/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"os"
)

5
cmd/openim-crontask/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/tools"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"os"

5
cmd/openim-msggateway/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"os"
)

5
cmd/openim-msgtransfer/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"os"
)

5
cmd/openim-push/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/push"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-auth/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/auth"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-conversation/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/conversation"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-friend/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/friend"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-group/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/group"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-msg/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/msg"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-third/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/third"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

5
cmd/openim-rpc/openim-rpc-user/main.go
View File

@ -16,6 +16,11 @@ package main
import (
"fmt"
<<<<<<< HEAD
=======
"os"
>>>>>>> upstream/main
"github.com/openimsdk/open-im-server/v3/internal/rpc/user"
"github.com/openimsdk/open-im-server/v3/pkg/common/cmd"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

1
go.mod
View File

@ -41,7 +41,6 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stathat/consistent v1.0.0
github.com/tencentyun/cos-go-sdk-v5 v0.7.45
go.uber.org/automaxprocs v1.5.3
golang.org/x/sync v0.4.0
gopkg.in/src-d/go-git.v4 v4.13.1
gotest.tools v2.2.0+incompatible

3
go.sum
View File

@ -277,7 +277,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@ -352,8 +351,6 @@ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8=
go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0=
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=

3
internal/msgtransfer/init.go
View File

@ -18,11 +18,12 @@ import (
"context"
"errors"
"fmt"
"github.com/OpenIMSDK/tools/errs"
"log"
"net/http"
"sync"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/mw"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"

3
internal/tools/cron_task.go
View File

@ -17,12 +17,13 @@ package tools
import (
"context"
"fmt"
"github.com/OpenIMSDK/tools/errs"
"os"
"os/signal"
"syscall"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/redis/go-redis/v9"
"github.com/robfig/cron/v3"

3
pkg/common/db/mgo/conversation.go
View File

@ -16,9 +16,10 @@ package mgo
import (
"context"
"github.com/OpenIMSDK/tools/errs"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/tools/mgoutil"
"github.com/OpenIMSDK/tools/pagination"

3
pkg/common/db/mgo/group.go
View File

@ -16,9 +16,10 @@ package mgo
import (
"context"
"github.com/OpenIMSDK/tools/errs"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/mgoutil"
"github.com/OpenIMSDK/tools/pagination"
"go.mongodb.org/mongo-driver/bson"

1
pkg/common/db/mgo/group_member.go
View File

@ -16,6 +16,7 @@ package mgo
import (
"context"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/protocol/constant"

1
pkg/common/db/mgo/group_request.go
View File

@ -16,6 +16,7 @@ package mgo
import (
"context"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/mgoutil"

1
pkg/common/db/unrelation/mongo.go
View File

@ -27,6 +27,7 @@ import (
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/mw/specialerror"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
)

3
pkg/common/discoveryregister/zookeeper/zookeeper.go
View File

@ -16,11 +16,12 @@ package zookeeper
import (
"fmt"
"github.com/OpenIMSDK/tools/errs"
"os"
"strings"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/discoveryregistry"
openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
"github.com/OpenIMSDK/tools/log"

3
pkg/common/kafka/consumer_group.go
View File

@ -16,9 +16,10 @@ package kafka
import (
"context"
"github.com/OpenIMSDK/tools/errs"
"strings"
"github.com/OpenIMSDK/tools/errs"
"github.com/OpenIMSDK/tools/log"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"

3
pkg/common/kafka/producer.go
View File

@ -18,10 +18,11 @@ import (
"bytes"
"context"
"errors"
"github.com/OpenIMSDK/tools/errs"
"strings"
"time"
"github.com/OpenIMSDK/tools/errs"
"github.com/IBM/sarama"
"github.com/OpenIMSDK/protocol/constant"
"github.com/OpenIMSDK/tools/log"

8
pkg/common/startrpc/start.go
View File

@ -17,6 +17,10 @@ package startrpc
import (
"errors"
"fmt"
<<<<<<< HEAD
=======
"log"
>>>>>>> upstream/main
"net"
"net/http"
"os"
@ -116,8 +120,12 @@ func Start(
// Create a HTTP server for prometheus.
httpServer := &http.Server{Handler: promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), Addr: fmt.Sprintf("0.0.0.0:%d", prometheusPort)}
if err := httpServer.ListenAndServe(); err != nil {
<<<<<<< HEAD
fmt.Fprintf(os.Stderr, "\n\nexit -1: \n%+v PrometheusPort: %d \n\n", err, prometheusPort)
os.Exit(-1)
=======
log.Fatal("Unable to start a http server. ", err.Error(), "PrometheusPort:", prometheusPort)
>>>>>>> upstream/main
}
}
return nil

2
scripts/lib/util.sh
View File

@ -451,6 +451,7 @@ openim::util::check_process_names() {
cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}'
return 1
else
echo ""
openim::log::success "All processes are running."
echo ""
return 0
@ -1691,6 +1692,7 @@ openim::util::check_process_names() {
cat "$TMP_LOG_FILE" | awk '{print "\033[31m" $0 "\033[0m"}'
return 1
else
echo ""
openim::log::success "All processes are running."
echo ""
return 0

8
tools/component/component.go
View File

@ -18,14 +18,16 @@ import (
"errors"
"flag"
"fmt"
"os"
"strings"
"time"
"github.com/IBM/sarama"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
"github.com/openimsdk/open-im-server/v3/pkg/common/db/unrelation"
"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/zookeeper"
"github.com/openimsdk/open-im-server/v3/pkg/common/kafka"
"os"
"strings"
"time"
"github.com/OpenIMSDK/tools/component"
"github.com/OpenIMSDK/tools/errs"

17
tools/ncpu/ncpu.go
View File

@ -1,3 +1,20 @@
<<<<<<< HEAD
=======
// Copyright © 2024 OpenIM. All rights reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
>>>>>>> upstream/main
package main
import (