tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.

Browse source
This commit is contained in:
Brett Hewitson 2022-03-22 20:01:50 +10:00
parent 8d84f67bd9
commit 9d4d49560e
12 changed files with 107 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ConanServerManager/Lib/ServerApp.cs
View file

@ -2443,6 +2443,18 @@ namespace ServerManagerTool.Lib
Debug.WriteLine($"[INFO] (Branch {GetBranchName(branchName) ?? "unknown"}) {message}");
}
private void LogProfileDebug(string message, bool includeProgressCallback = true)
{
message = message ?? string.Empty;
_loggerProfile?.Debug(message);
if (includeProgressCallback)
ProgressCallback?.Invoke(0, $"{message}");
Debug.WriteLine($"[DEBUG] (Profile {_profile?.ProfileName ?? "unknown"}) {message}");
}
private void LogProfileError(string error, bool includeProgressCallback = true)
{
if (string.IsNullOrWhiteSpace(error))
@ -2614,37 +2626,27 @@ namespace ServerManagerTool.Lib
var server = QueryMaster.ServerQuery.GetServerInstance(QueryMaster.EngineType.Source, endPoint, sendTimeOut: 10000, receiveTimeOut: 10000);
if (server == null)
{
#if DEBUG
LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false);
#endif
LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - ServerQuery could not be created.", false);
return;
}
#if DEBUG
LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false);
#endif
LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - ServerQuery was created.", false);
Task.Delay(1000).Wait();
_rconConsole = server.GetControl(_profile.AdminPassword);
_rconConsole = server.GetControl(_profile.RconPassword);
if (_rconConsole == null)
{
#if DEBUG
LogProfileMessage($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.AdminPassword}).", false);
#endif
LogProfileDebug($"FAILED: {nameof(SetupRconConsole)} - RconConsole could not be created ({_profile.RconPassword}).", false);
return;
}
#if DEBUG
LogProfileMessage($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.AdminPassword}).", false);
#endif
LogProfileDebug($"SUCCESS: {nameof(SetupRconConsole)} - RconConsole was created ({_profile.RconPassword}).", false);
}
catch (Exception ex)
{
#if DEBUG
LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false);
LogProfileMessage($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false);
#endif
LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.Message}", false);
LogProfileDebug($"ERROR: {nameof(SetupRconConsole)}\r\n{ex.StackTrace}", false);
}
}

25
src/ConanServerManager/VersionFeed.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager release version feed.</subtitle>
<link href="http://servermanagers.freeforums.net/" />
<updated>2022-03-03T00:00:00Z</updated>
<updated>2022-03-22T00:00:00Z</updated>
<entry>
<id>urn:uuid:674D8E81-FB1B-42D9-8309-41AE40D5192F</id>
<title>1.1.64 (1.1.64.1)</title>
<summary>1.1.64.1</summary>
<link href="" />
<updated>2022-03-22T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284</id>

37
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,44 +5,21 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager beta version feed.</subtitle>
<link href="http://servermanagers.freeforums.net/" />
<updated>2022-03-03T00:00:00Z</updated>
<updated>2022-03-22T00:00:00Z</updated>
<entry>
<id>urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284</id>
<title>1.1.63 (1.1.63.2)</title>
<summary>1.1.63.2</summary>
<id>urn:uuid:674D8E81-FB1B-42D9-8309-41AE40D5192F</id>
<title>1.1.64 (1.1.64.1)</title>
<summary>1.1.64.1</summary>
<link href="" />
<updated>2022-03-03T00:00:00Z</updated>
<updated>2022-03-22T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<u style="font-size: .9em;">BUGFIX</u>
<br/>
<ul>
<li>Misc. Language File Updates.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284</id>
<title>1.1.63 (1.1.63.1)</title>
<summary>1.1.63.1</summary>
<link href="" />
<updated>2022-03-02T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Branch Details moved to new Server Details section, easier to perform profile sync.</li>
<li>Fixed a bug that would prevent auto processes from sending through broadcast messages to the clients.</li>
</ul>
</p>
</div>