cfg test

main.go

@@ -4,7 +4,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"krakatoa.net/backend/modules/configs/kraSettingsConfig"
 	"krakatoa.net/backend/modules/configs/serverConfig"
-	serverconfig "krakatoa.net/backend/modules/configs/serverConfig"
 	"krakatoa.net/backend/modules/logger"
 	"krakatoa.net/backend/modules/mongo"
 	"krakatoa.net/backend/servers/minecraft"
@@ -14,7 +13,7 @@ import (
 func init() {
 	serverConfig.LoadServerConfig()
 
-	if serverconfig.Cfg.Debug {
+	if serverConfig.Cfg.Debug {
 		log.SetLevel(log.DebugLevel)
 	}
 

modules/kraProtocol/kraProtocol.go

@@ -25,7 +25,7 @@ const (
 	DestPlayersCurrentServer = 11
 )
 
-func SendMessageToClient(status int, cmdID int, cmdNumber int, args interface{}) []byte {
+func EncodeWebMessage(status int, cmdID int, cmdNumber int, args interface{}) []byte {
 	argType := reflect.TypeOf(args).String()
 	var argLen int
 	var kraProtocolMessageToClientData structs.KraProtocolMessageToClient

modules/mongo/mongo.go

@@ -18,6 +18,8 @@ var PlayersCollection *mongo.Collection
 func getConnectionURI() string {
 	cfg := serverconfig.Cfg.MongoDB
 
+	logger.Mongo.Println("mongo cfg", cfg.Username)
+
 	return "mongodb://" + cfg.Username + ":" + cfg.Password + "@" + cfg.Hostname + ":" + cfg.Port + "/?maxPoolSize=20&w=majority&authSource=" + cfg.Database
 }
 

serverCommunication/minecraft.go

@@ -49,7 +49,7 @@ func HandleMinecraftMessage(conn *websocket.Conn, status int, cmdID int, dest in
 		destConn := getConnForDest(dest, playerUuid)
 
 		if destConn != nil {
-			raw = kraProtocol.SendMessageToClient(status, cmdID, cmdNumber, args)
+			raw = kraProtocol.EncodeWebMessage(status, cmdID, cmdNumber, args)
 
 			err = destConn.WriteMessage(websocket.BinaryMessage, raw)
 

serverCommunication/web.go

@@ -25,7 +25,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 		client = getWebClientByConn(conn)
 
 		if client == nil {
-			raw = kraProtocol.SendMessageToClient(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "")
+			raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "")
 
 			err = client.SendBinaryMessage(conn, raw)
 
@@ -45,7 +45,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 			}
 
 			if cmdIDInList { // cmdID already in queue
-				raw = kraProtocol.SendMessageToClient(kraProtocol.StatusMessageAlreadyInQueue, cmdID, cmdNumber, "")
+				raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusMessageAlreadyInQueue, cmdID, cmdNumber, "")
 
 				err = client.SendBinaryMessage(conn, raw)
 
@@ -85,7 +85,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 				connForDest := getConnForDest(dest, uuid) // get conn for mobile
 
 				if connForDest != nil { // mobile is connected
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, args)
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, args)
 
 					err = client.SendBinaryMessage(connForDest, raw)
 
@@ -93,7 +93,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 						logger.WebVoice.Warnln("write:", err)
 					}
 				} else { // mobile not connected
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, 58299, cmdNumber, "")
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 58299, cmdNumber, "")
 
 					err = client.SendBinaryMessage(conn, raw)
 
@@ -106,7 +106,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 
 				if status == kraProtocol.StatusGet {
 					logger.Web.Debugln("status get reply")
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs)
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs)
 
 					err = client.SendBinaryMessage(conn, raw)
 
@@ -120,7 +120,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 				connForDest := getConnForDest(dest, uuid) // get conn for voice
 
 				if connForDest != nil { // voice connected
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, cmdID, cmdNumber, args)
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, cmdID, cmdNumber, args)
 
 					err = client.SendBinaryMessage(connForDest, raw)
 
@@ -128,7 +128,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 						logger.WebMobile.Warnln("write:", err)
 					}
 				} else { // voice not connected
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusSend, 5456, cmdNumber, "")
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusSend, 5456, cmdNumber, "")
 
 					err = client.SendBinaryMessage(conn, raw)
 
@@ -140,7 +140,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 				resArgs := mobileCommandHandler(cmdNumber)
 
 				if status == kraProtocol.StatusGet {
-					raw = kraProtocol.SendMessageToClient(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs)
+					raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusReply, cmdID, cmdNumber, resArgs)
 
 					err = client.SendBinaryMessage(conn, raw)
 
@@ -149,7 +149,7 @@ func HandleWebMessage(isVoice bool, conn *websocket.Conn, uuid string, status in
 					}
 				}
 			} else { // err dest unknown
-				raw = kraProtocol.SendMessageToClient(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "")
+				raw = kraProtocol.EncodeWebMessage(kraProtocol.StatusErrTryAgain, cmdID, cmdNumber, "")
 
 				err = client.SendBinaryMessage(conn, raw)
 

servers/web/socketHub.go

@@ -93,7 +93,7 @@ func Test() {
 	for {
 		for _, client := range cache.WebClients {
 
-			raw := kraProtocol.SendMessageToClient(1, 1, 2, "this a test ping")
+			raw := kraProtocol.EncodeWebMessage(1, 1, 2, "this a test ping")
 
 			if client.VoiceConn != nil {
 				client.SendBinaryMessage(client.VoiceConn, raw)