mirror of
https://github.com/tribufu/ServerManagers
synced 2026-05-06 15:17:34 +00:00
Fixed a bug with the Server Shutdown when the CheckForOnlinePlayers option not selected.
Fixed a bug when the backup path was a root directory that caused a 'Invalid URI: A Dos path must be rooted, for example' crash. Language File updates
This commit is contained in:
Brett Hewitson
parent
4513fe119b
commit
bfc8b87872
14 changed files with 199 additions and 379 deletions
|
|
@ -525,9 +525,9 @@ namespace ServerManagerTool
|
|||
|
||||
var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
|
||||
var backupFolder = includeBackup
|
||||
? IOUtils.NormalizePath(string.IsNullOrWhiteSpace(Config.Default.BackupPath)
|
||||
? string.IsNullOrWhiteSpace(Config.Default.BackupPath)
|
||||
? Path.Combine(Config.Default.DataPath, Config.Default.BackupRelativePath)
|
||||
: Path.Combine(Config.Default.BackupPath))
|
||||
: Path.Combine(Config.Default.BackupPath)
|
||||
: null;
|
||||
|
||||
SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, backupFolder);
|
||||
|
|
|
|||
|
|
@ -8,8 +8,9 @@
|
|||
AutoShutdown1,
|
||||
AutoShutdown2,
|
||||
Backup,
|
||||
Shutdown,
|
||||
Restart,
|
||||
Shutdown,
|
||||
Stop,
|
||||
Update,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -423,6 +423,16 @@ namespace ServerManagerTool.Lib
|
|||
LogProfileMessage("Starting shutdown timer...");
|
||||
|
||||
var minutesLeft = ShutdownInterval;
|
||||
if (ServerProcess == ServerProcessType.Stop)
|
||||
{
|
||||
LogProfileMessage($"Server shutdown type is {ServerProcess}, shutdown timer cancelled.");
|
||||
minutesLeft = 0;
|
||||
}
|
||||
else if (!CheckForOnlinePlayers)
|
||||
{
|
||||
LogProfileMessage("CheckForOnlinePlayers disabled, shutdown timer will not perform online player check.");
|
||||
}
|
||||
|
||||
while (minutesLeft > 0)
|
||||
{
|
||||
if (cancellationToken.IsCancellationRequested)
|
||||
|
|
@ -466,7 +476,6 @@ namespace ServerManagerTool.Lib
|
|||
else
|
||||
{
|
||||
Debug.WriteLine($"CheckForOnlinePlayers disabled, shutdown timer cancelled.");
|
||||
break;
|
||||
}
|
||||
|
||||
var message = string.Empty;
|
||||
|
|
|
|||
|
|
@ -523,7 +523,7 @@ namespace ServerManagerTool.Utils
|
|||
OutputLogs = false,
|
||||
SendAlerts = true,
|
||||
SendEmails = false,
|
||||
ServerProcess = ServerProcessType.Shutdown,
|
||||
ServerProcess = ServerProcessType.Stop,
|
||||
ShutdownInterval = 0,
|
||||
ServerStatusChangeCallback = (ServerStatus serverStatus) =>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,31 @@
|
|||
<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>2021-12-12T00:00:00Z</updated>
|
||||
<updated>2021-12-15T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:6383E79A-C31F-462B-9730-B26B28DC5EFF</id>
|
||||
<title>1.1.57 (1.1.57.1)</title>
|
||||
<summary>1.1.57.1</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-15T00: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 with the Server Shutdown when the CheckForOnlinePlayers option not selected.</li>
|
||||
<li>Fixed a bug when the backup path was a root directory that caused a 'Invalid URI: A Dos path must be rooted, for example' crash.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:F8A08616-749B-48E7-87D5-D97E86AB3926</id>
|
||||
|
|
|
|||
|
|
@ -5,144 +5,22 @@
|
|||
<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>2021-12-12T00:00:00Z</updated>
|
||||
<updated>2021-12-15T00:00:00Z</updated>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:4C15C7A9-317C-4A9B-B426-6E885B918D3B</id>
|
||||
<title>1.1.56 (1.1.56.6)</title>
|
||||
<summary>1.1.56.6</summary>
|
||||
<id>urn:uuid:6383E79A-C31F-462B-9730-B26B28DC5EFF</id>
|
||||
<title>1.1.57 (1.1.57.1)</title>
|
||||
<summary>1.1.57.1</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-12T00:00:00Z</updated>
|
||||
<updated>2021-12-15T00: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>Reference library updates.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:126E8E9F-7FF2-4239-88D6-5FFC89925463</id>
|
||||
<title>1.1.56 (1.1.56.5)</title>
|
||||
<summary>1.1.56.5</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-10T00: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>Server Monitor window now stores it's location.</li>
|
||||
<li>Reference library updates.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:BECA74AB-1107-40B0-932A-A851E978EABF</id>
|
||||
<title>1.1.56 (1.1.56.4)</title>
|
||||
<summary>1.1.56.4</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-09T00: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 minor issue when clicking the data directory reset button - fringe case that I found during testing.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:8C834060-F20F-4ACE-8F49-0B459531BA3C</id>
|
||||
<title>1.1.56 (1.1.56.3)</title>
|
||||
<summary>1.1.56.3</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-08T00: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 language translation of Data Directory window.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:339F72FC-920A-4425-AF86-AF9B34611A21</id>
|
||||
<title>1.1.56 (1.1.56.2)</title>
|
||||
<summary>1.1.56.2</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-08T00: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>Global Settings - Added reset button to the Data Directory Location.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
</content>
|
||||
<author>
|
||||
<name>bletch</name>
|
||||
<email>bletch1971@hotmail.com</email>
|
||||
</author>
|
||||
</entry>
|
||||
|
||||
<entry>
|
||||
<id>urn:uuid:F8A08616-749B-48E7-87D5-D97E86AB3926</id>
|
||||
<title>1.1.56 (1.1.56.1)</title>
|
||||
<summary>1.1.56.1</summary>
|
||||
<link href="" />
|
||||
<updated>2021-12-06T00: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;">NEW</u>
|
||||
<br/>
|
||||
<ul>
|
||||
<li>
|
||||
A new Discord Bot has been added to the server manager.<br/>
|
||||
This new discord bot will allow you to send <font color="#0094FF">Start, Stop, Shutdown, Restart, Backup and Update</font> commands to the server manager from within your discord client.<br/>
|
||||
To setup the new discord bot, open the global settings and scroll down to the Discord section.<br/><br/>
|
||||
<font color="#e62919">
|
||||
NOTE: This is long process to get the discord bot working, and I have created a forum post with detailed instructions how to do it.
|
||||
</font>
|
||||
</li>
|
||||
<li>Fixed a bug with the Server Shutdown when the CheckForOnlinePlayers option not selected.</li>
|
||||
<li>Fixed a bug when the backup path was a root directory that caused a 'Invalid URI: A Dos path must be rooted, for example' crash.</li>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue