From 867cbaff6e8c54ff1718822ea0b956380b6521d5 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 11 Apr 2024 15:09:59 +0800 Subject: [PATCH] Optimize Docker configuration and script. --- config/share.yml | 18 ++++----- tools/check-component/main_test.go | 65 ------------------------------ tools/check-free-memory/main.go | 2 +- 3 files changed, 10 insertions(+), 75 deletions(-) delete mode 100644 tools/check-component/main_test.go diff --git a/config/share.yml b/config/share.yml index eeaf1e55c..1d709ccfb 100644 --- a/config/share.yml +++ b/config/share.yml @@ -1,15 +1,15 @@ secret: openIM123 env: zookeeper rpcRegisterName: - user: User - friend: Friend - msg: Msg - push: Push - messageGateway: MessageGateway - group: Group - auth: Auth - conversation: Conversation - third: Third + user: user + friend: friend + msg: msg + push: push + messageGateway: messageGateway + group: group + auth: auth + conversation: conversation + third: third imAdmin: userID: [ "imAdmin" ] nickname: [ "imAdmin" ] diff --git a/tools/check-component/main_test.go b/tools/check-component/main_test.go deleted file mode 100644 index c56361b2c..000000000 --- a/tools/check-component/main_test.go +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright © 2023 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. - -package main - -import ( - "context" - "strconv" - "testing" - "time" - - "github.com/redis/go-redis/v9" -) - -func TestRedis(t *testing.T) { - conf, err := initCfg() - conf.Redis.Address = []string{ - "172.16.8.142:7000", - //"172.16.8.142:7000", "172.16.8.142:7001", "172.16.8.142:7002", "172.16.8.142:7003", "172.16.8.142:7004", "172.16.8.142:7005", - } - - var redisClient redis.UniversalClient - defer func() { - if redisClient != nil { - redisClient.Close() - } - }() - if len(conf.Redis.Address) > 1 { - redisClient = redis.NewClusterClient(&redis.ClusterOptions{ - Addrs: conf.Redis.Address, - Username: conf.Redis.Username, - Password: conf.Redis.Password, - }) - } else { - redisClient = redis.NewClient(&redis.Options{ - Addr: conf.Redis.Address[0], - Username: conf.Redis.Username, - Password: conf.Redis.Password, - }) - } - _, err = redisClient.Ping(context.Background()).Result() - if err != nil { - t.Fatal(err) - } - - for i := 0; i < 1000000; i++ { - val, err := redisClient.Set(context.Background(), "b_"+strconv.Itoa(i), "test", time.Second*10).Result() - t.Log("index", i, "resp", val, "err", err) - if err != nil { - return - } - } - -} diff --git a/tools/check-free-memory/main.go b/tools/check-free-memory/main.go index c057f0cde..949caaed7 100644 --- a/tools/check-free-memory/main.go +++ b/tools/check-free-memory/main.go @@ -15,7 +15,7 @@ func main() { freeMemoryGB := float64(vMem.Free) / float64(1024*1024*1024) - if freeMemoryGB < 4.0 { + if freeMemoryGB < 1.0 { fmt.Fprintf(os.Stderr, "System free memory is less than 4GB: %.2fGB\n", freeMemoryGB) os.Exit(1) } else {