From 2368a8fba336021d60df63e5adc5e2890567df53 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 14 Sep 2022 11:00:27 +0800 Subject: [PATCH 1/3] fix transfer --- script/msg_transfer_start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/msg_transfer_start.sh b/script/msg_transfer_start.sh index 8a66ec35e..746cf3342 100755 --- a/script/msg_transfer_start.sh +++ b/script/msg_transfer_start.sh @@ -25,7 +25,7 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do prome_port=${prome_ports[$i]} cmd="nohup ./${msg_transfer_name}" if [ $prome_port != "" ]; then - cmd=$cmd+" -prometheus_port $prome_port" + cmd="$cmd -prometheus_port $prome_port" fi $cmd >>../logs/openIM.log 2>&1 & done From 88af048e907c38438fb048573a0e619cf6527929 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 14 Sep 2022 12:19:17 +0800 Subject: [PATCH 2/3] add log --- pkg/common/db/mysql.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 4f746fc1e..9702f4b43 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -23,6 +23,7 @@ func (w Writer) Printf(format string, args ...interface{}) { } func initMysqlDB() { + fmt.Println("init mysqlDB start") //When there is no open IM database, connect to the mysql built-in database to create openIM database dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local", config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], "mysql") From c018d6311781ba7f14482a5648e08a84828c3067 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 14 Sep 2022 12:24:29 +0800 Subject: [PATCH 3/3] add log --- pkg/common/db/mysql.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 9702f4b43..d43ce736d 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -41,7 +41,7 @@ func initMysqlDB() { panic(err1.Error()) } } - + fmt.Println("init db", db) //Check the database and table during initialization sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName) err = db.Exec(sql).Error @@ -49,7 +49,7 @@ func initMysqlDB() { fmt.Println("0", "Exec failed ", err.Error(), sql) panic(err.Error()) } - + fmt.Println(sql) dsn = fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=true&loc=Local", config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName) @@ -69,12 +69,12 @@ func initMysqlDB() { fmt.Println("0", "Open failed ", err.Error(), dsn) panic(err.Error()) } - + fmt.Println("init db2", db) sqlDB, err := db.DB() if err != nil { panic(err.Error()) } - + fmt.Println("init sqlDB", sqlDB) sqlDB.SetConnMaxLifetime(time.Second * time.Duration(config.Config.Mysql.DBMaxLifeTime)) sqlDB.SetMaxOpenConns(config.Config.Mysql.DBMaxOpenConns) sqlDB.SetMaxIdleConns(config.Config.Mysql.DBMaxIdleConns)