kerboul/perun
1
0
Fork 0
mirror of https://github.com/DaKerboul/perun.git synced 2026-08-09 14:45:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved MySQL connection status; performane improvment

Browse Source
This commit is contained in:
szporowolik
2019-10-22 15:12:07 +02:00
parent ab86b3bcec
commit a78ad87312
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
02_Windows_App/Perun_v1/01_Classes/DatabaseController.cs
View File

@@ -9,9 +9,13 @@ public class DatabaseController
public MySqlConnection connMySQL;
public bool bStatus;
public void SendToMySql(string strRawTCPFrame)
public void SendToMySql(string strRawTCPFrame, bool bCheckConnection = false)
{
// Main function to send data to mysql
if (bCheckConnection)
{
strRawTCPFrame = "{\"type\": \"-1\"}";
}
dynamic strTCPFrame = JsonConvert.DeserializeObject(strRawTCPFrame); // Deserialize raw data
string strTCPFrameType = strTCPFrame.type;
string strTCPFrameTimestamp = strTCPFrame.timestamp;
@@ -76,6 +80,11 @@ public class DatabaseController
strSQLQueryTxt += "UPDATE `pe_DataPlayers` SET pe_DataPlayers_lastip='" + strTCPFrame.payload.login_ipaddr + "', pe_DataPlayers_lastname='" + strTCPFrame.payload.login_name + "',pe_DataPlayers_updated='" + strTCPFrame.payload.login_datetime + "' WHERE `pe_DataPlayers_ucid`= '" + strTCPFrame.payload.login_ucid + "';";
strSQLQueryTxt += "INSERT INTO `pe_LogLogins` (`pe_LogLogins_datetime`, `pe_LogLogins_playerid`, `pe_LogLogins_name`, `pe_LogLogins_ip`,`pe_LogLogins_instance`) VALUES ('" + strTCPFrame.payload.login_datetime + "', (SELECT pe_DataPlayers_id from pe_DataPlayers WHERE pe_DataPlayers_ucid = '" + strTCPFrame.payload.login_ucid + "'), '" + strTCPFrame.payload.login_name + "', '" + strTCPFrame.payload.login_ipaddr + "','" + strTCPFrameInstance + "');";
}
else if (strTCPFrameType == "-1")
{
// keep alibe
strSQLQueryTxt = "SELECT 1;";
}
else
{
// General definition used for 1-10 type packets
@@ -98,10 +107,6 @@ public class DatabaseController
MySqlCommand cmdMySQL = new MySqlCommand(strSQLQueryTxt, connMySQL);
MySqlDataReader rdrMySQL = cmdMySQL.ExecuteReader();
while (rdrMySQL.Read())
{
Console.WriteLine(rdrMySQL[0] + " -- " + rdrMySQL[1]);
}
rdrMySQL.Close();
switch (Int32.Parse(strTCPFrameType))
{
@@ -132,6 +137,8 @@ public class DatabaseController
case 101:
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "LotATC data send", 1,0,"101");
break;
case -1:
break;
default:
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "Data send", 1,0, strTCPFrameType);
break;
@@ -143,6 +150,7 @@ public class DatabaseController
// General exception found
Console.WriteLine(a_ex.ToString());
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "ERROR MySQL - error: " + a_ex.Message,1,1, strTCPFrameType);
Globals.intGameErros++;
bStatus = false;
}
catch (MySqlException m_ex)
@@ -158,6 +166,7 @@ public class DatabaseController
break;
default:
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "ERROR MySQL - error id: " + m_ex.Number,1,1, strTCPFrameType);
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "ERROR MySQL - query: " + strSQLQueryTxt, 1, 1, strTCPFrameType);
PerunHelper.GUILogHistoryAdd(ref Globals.arrGUILogHistory, "ERROR MySQL - error: " + m_ex.Message,1,1, strTCPFrameType);
break;
}

6
02_Windows_App/Perun_v1/01_Classes/PerunHelper.cs
View File

@@ -42,12 +42,12 @@ internal class PerunHelper
// Add new entry
arrLogHistory[arrLogHistory.Length - 1] = DateTime.Now.ToString("HH:mm:ss") + " " + strDirection + " " + strEntryToAdd; // Add entry at the last position
// Update control at my window
Globals.bGUILogHistoryUpdate = true;
}
// Add the entry to log file
LogController.WriteLog(DateTime.Now.ToString("yyyy-dd-MM ") + " " + DateTime.Now.ToString("HH:mm:ss") + " | Instance: "+ Globals.intInstanceId + " | " + strMarker + " | "+ strDirection + " | "+ strType + " | " + strEntryToAdd);
// Update control at my window
Globals.bGUILogHistoryUpdate = true;
}
public static string GetAppVersion(string strBeginning)
{

7
02_Windows_App/Perun_v1/02_Forms/form_Main.cs
View File

@@ -478,7 +478,12 @@ namespace Perun_v1
private void tim_3rdparties_Tick(object sender, EventArgs e)
{
// Main timer to send JSON files to MySQL
// Main timer to check MySQL connection and send JSON files to MySQL
// Send ping to check for possible connection issues
dcConnection.SendToMySql("", true);
// Take care of 3rd party stuff
string strSRSJson = "";
string strLotATCJson = "";