This commit is contained in:
wangchuxiao
2023-03-08 13:34:12 +08:00
parent 107f4c950b
commit f8ad35a6f7
24 changed files with 209 additions and 125 deletions
+1 -1
View File
@@ -39,7 +39,7 @@ func run(port int) error {
if config.Config.Api.ListenIP != "" {
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(port)
}
fmt.Println("start api server, address: ", address, ", OpenIM version: ", constant.CurrentVersion)
fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
err = router.Run(address)
if err != nil {
log.Error("", "api run failed ", address, err.Error())
+1 -2
View File
@@ -9,8 +9,7 @@ import (
func main() {
cronTaskCmd := cmd.NewCronTaskCmd()
cronTaskCmd.AddRunE(tools.StartCronTask)
if err := cronTaskCmd.Execute(); err != nil {
if err := cronTaskCmd.Exec(tools.StartCronTask); err != nil {
fmt.Println(err)
os.Exit(1)
}
+9 -22
View File
@@ -1,31 +1,18 @@
package main
import (
"OpenIM/internal/msggateway"
"OpenIM/pkg/common/config"
"OpenIM/pkg/common/constant"
"OpenIM/pkg/common/log"
"flag"
"OpenIM/pkg/common/cmd"
"fmt"
"sync"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
msgGatewayCmd := cmd.NewMsgGatewayCmd()
msgGatewayCmd.AddPortFlag()
msgGatewayCmd.AddPrometheusPortFlag()
msgGatewayCmd.AddWsPortFlag()
if err := msgGatewayCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
log.NewPrivateLog(constant.LogFileName)
defaultRpcPorts := config.Config.RpcPort.OpenImMessageGatewayPort
defaultWsPorts := config.Config.LongConnSvr.WebsocketPort
defaultPromePorts := config.Config.Prometheus.MessageGatewayPrometheusPort
rpcPort := flag.Int("rpc_port", defaultRpcPorts[0], "rpc listening port")
wsPort := flag.Int("ws_port", defaultWsPorts[0], "ws listening port")
prometheusPort := flag.Int("prometheus_port", defaultPromePorts[0], "PushrometheusPort default listen port")
flag.Parse()
var wg sync.WaitGroup
wg.Add(1)
fmt.Println("start rpc/msg_gateway server, port: ", *rpcPort, *wsPort, *prometheusPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
msggateway.Init(*rpcPort, *wsPort)
msggateway.Run(*prometheusPort)
wg.Wait()
}
+8 -16
View File
@@ -1,24 +1,16 @@
package main
import (
"OpenIM/internal/msgtransfer"
"OpenIM/pkg/common/config"
"OpenIM/pkg/common/constant"
"OpenIM/pkg/common/log"
"flag"
"sync"
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
msgTransferCmd := cmd.NewMsgTransferCmd()
msgTransferCmd.AddPrometheusPortFlag()
if err := msgTransferCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
var wg sync.WaitGroup
wg.Add(1)
prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
log.NewPrivateLog(constant.LogFileName)
if err := msgtransfer.StartTransfer(*prometheusPort); err != nil {
panic(err)
}
wg.Wait()
}
+10 -11
View File
@@ -1,19 +1,18 @@
package main
import (
"OpenIM/internal/push"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/config"
"OpenIM/pkg/common/constant"
"OpenIM/pkg/common/log"
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(); err != nil {
panic(err.Error())
}
log.NewPrivateLog(constant.LogFileName)
if err := startrpc.Start(config.Config.RpcPort.OpenImAuthPort[0], config.Config.RpcRegisterName.OpenImAuthName, config.Config.Prometheus.AuthPrometheusPort[0], push.Start); err != nil {
panic(err.Error())
pushCmd := cmd.NewPushCmd()
pushCmd.AddPortFlag()
pushCmd.AddPrometheusPortFlag()
pushCmd.AddPush()
if err := pushCmd.Execute(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/auth"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImAuthPort[0], config.Config.RpcRegisterName.OpenImAuthName, config.Config.Prometheus.AuthPrometheusPort[0], auth.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImAuthName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(auth.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/conversation"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImConversationPort[0], config.Config.RpcRegisterName.OpenImConversationName, config.Config.Prometheus.ConversationPrometheusPort[0], conversation.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImConversationName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(conversation.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/friend"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImFriendPort[0], config.Config.RpcRegisterName.OpenImFriendName, config.Config.Prometheus.FriendPrometheusPort[0], friend.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImFriendName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(friend.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+10 -7
View File
@@ -1,16 +1,19 @@
package main
import (
"OpenIM/internal/rpc/group"
"OpenIM/internal/startrpc"
"OpenIM/internal/rpc/friend"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImGroupPort[0], config.Config.RpcRegisterName.OpenImGroupName, config.Config.Prometheus.GroupPrometheusPort[0], group.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImGroupName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(friend.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/msg"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImMessagePort[0], config.Config.RpcRegisterName.OpenImMsgName, config.Config.Prometheus.AuthPrometheusPort[0], msg.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImMsgName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(msg.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/third"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImThirdPort[0], config.Config.RpcRegisterName.OpenImThirdName, config.Config.Prometheus.ThirdPrometheusPort[0], third.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImThirdName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(third.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}
+9 -6
View File
@@ -2,15 +2,18 @@ package main
import (
"OpenIM/internal/rpc/user"
"OpenIM/internal/startrpc"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
if err := config.InitConfig(""); err != nil {
panic(err.Error())
}
if err := startrpc.Start(config.Config.RpcPort.OpenImUserPort[0], config.Config.RpcRegisterName.OpenImUserName, config.Config.Prometheus.UserPrometheusPort[0], user.Start); err != nil {
panic(err.Error())
rpcCmd := cmd.NewRpcCmd(config.Config.RpcRegisterName.OpenImUserName)
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(user.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
}
}