PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

add optional restart save timeout

Browse Source
This commit is contained in:
zznty
2024-11-09 19:28:27 +07:00
parent d15985e918
commit 7ea0a4f8b9
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Torch.API/ITorchConfig.cs
View File

@@ -34,6 +34,7 @@ namespace Torch
string LoginToken { get; set; } string LoginToken { get; set; }
UpdateSource UpdateSource { get; set; } UpdateSource UpdateSource { get; set; }
List<string> Packages { get; set; } List<string> Packages { get; set; }
int RestartSaveTimeout { get; set; }
void Save(string path = null); void Save(string path = null);
} }

3
Torch.Server/TorchConfig.cs
View File

@@ -122,6 +122,9 @@ public class TorchConfig : ViewModel, ITorchConfig
[Display(Name = "Packages", Description = "Packages to install and use.", GroupName = "Server")] [Display(Name = "Packages", Description = "Packages to install and use.", GroupName = "Server")]
public List<string> Packages { get; set; } = new(); public List<string> Packages { get; set; } = new();
[Display(Name = "Restart Save Timeout", Description = "Timeout for save operation on restart in seconds.", GroupName = "Server")]
public int RestartSaveTimeout { get; set; }
// for backward compatibility // for backward compatibility
public void Save(string path = null) => Initializer.Instance?.ConfigPersistent?.Save(path); public void Save(string path = null) => Initializer.Instance?.ConfigPersistent?.Save(path);
} }

3
Torch.Server/TorchServer.cs
View File

@@ -248,7 +248,8 @@ namespace Torch.Server
{ {
if (save) if (save)
{ {
var saveResult = Save(exclusive: true).Result; var saveResult = Save(Config.RestartSaveTimeout == 0 ? -1 : Config.RestartSaveTimeout,
exclusive: true).Result;
if (saveResult is not (GameSaveResult.Success or GameSaveResult.TimedOut)) if (saveResult is not (GameSaveResult.Success or GameSaveResult.TimedOut))
{ {
Log.Error("Save failed due to {Reason}. Restart aborted!", saveResult); Log.Error("Save failed due to {Reason}. Restart aborted!", saveResult);