Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

misc fixes

Browse Source
This commit is contained in:
RaidMax 2022-10-25 15:39:49 -05:00
parent b5b01cba4c
commit 16739ce455
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/IW4MServer.cs
View File

@ -1304,7 +1304,7 @@ namespace IW4MAdmin
this.MaxClients = maxplayers; this.MaxClients = maxplayers;
this.FSGame = game.Value; this.FSGame = game.Value;
this.Gametype = gametype; this.Gametype = gametype;
this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress; this.IP = ip.Value is "localhost" or "0.0.0.0" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
this.GamePassword = gamePassword.Value; this.GamePassword = gamePassword.Value;
UpdateMap(mapname); UpdateMap(mapname);

18
Application/Misc/ScriptPlugin.cs
View File

@ -112,6 +112,7 @@ namespace IW4MAdmin.Application.Misc
} }
} }
_scriptEngine?.Dispose();
_scriptEngine = new Engine(cfg => _scriptEngine = new Engine(cfg =>
cfg.AddExtensionMethods(typeof(Utilities), typeof(Enumerable), typeof(Queryable), cfg.AddExtensionMethods(typeof(Utilities), typeof(Enumerable), typeof(Queryable),
typeof(ScriptPluginExtensions)) typeof(ScriptPluginExtensions))
@ -247,9 +248,12 @@ namespace IW4MAdmin.Application.Misc
return; return;
} }
var shouldRelease = false;
try try
{ {
await _onProcessing.WaitAsync(); await _onProcessing.WaitAsync();
shouldRelease = true;
WrapJavaScriptErrorHandling(() => WrapJavaScriptErrorHandling(() =>
{ {
_scriptEngine.SetValue("_gameEvent", gameEvent); _scriptEngine.SetValue("_gameEvent", gameEvent);
@ -260,7 +264,7 @@ namespace IW4MAdmin.Application.Misc
} }
finally finally
{ {
if (_onProcessing.CurrentCount == 0) if (_onProcessing.CurrentCount == 0 && shouldRelease)
{ {
_onProcessing.Release(1); _onProcessing.Release(1);
} }
@ -268,7 +272,7 @@ namespace IW4MAdmin.Application.Misc
} }
public Task OnLoadAsync(IManager manager) public Task OnLoadAsync(IManager manager)
{ {
_logger.LogDebug("OnLoad executing for {Name}", Name); _logger.LogDebug("OnLoad executing for {Name}", Name);
@ -320,11 +324,14 @@ namespace IW4MAdmin.Application.Misc
public T ExecuteAction<T>(Delegate action, CancellationToken token, params object[] param) public T ExecuteAction<T>(Delegate action, CancellationToken token, params object[] param)
{ {
var shouldRelease = false;
try try
{ {
using var forceTimeout = new CancellationTokenSource(5000); using var forceTimeout = new CancellationTokenSource(5000);
using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token); using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token);
_onProcessing.Wait(combined.Token); _onProcessing.Wait(combined.Token);
shouldRelease = true;
_logger.LogDebug("Executing action for {Name}", Name); _logger.LogDebug("Executing action for {Name}", Name);
@ -343,7 +350,7 @@ namespace IW4MAdmin.Application.Misc
} }
finally finally
{ {
if (_onProcessing.CurrentCount == 0) if (_onProcessing.CurrentCount == 0 && shouldRelease)
{ {
_onProcessing.Release(1); _onProcessing.Release(1);
} }
@ -352,11 +359,14 @@ namespace IW4MAdmin.Application.Misc
public T WrapDelegate<T>(Delegate act, CancellationToken token, params object[] args) public T WrapDelegate<T>(Delegate act, CancellationToken token, params object[] args)
{ {
var shouldRelease = false;
try try
{ {
using var forceTimeout = new CancellationTokenSource(5000); using var forceTimeout = new CancellationTokenSource(5000);
using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token); using var combined = CancellationTokenSource.CreateLinkedTokenSource(forceTimeout.Token, token);
_onProcessing.Wait(combined.Token); _onProcessing.Wait(combined.Token);
shouldRelease = true;
_logger.LogDebug("Wrapping delegate action for {Name}", Name); _logger.LogDebug("Wrapping delegate action for {Name}", Name);
@ -373,7 +383,7 @@ namespace IW4MAdmin.Application.Misc
} }
finally finally
{ {
if (_onProcessing.CurrentCount == 0) if (_onProcessing.CurrentCount == 0 && shouldRelease)
{ {
_onProcessing.Release(1); _onProcessing.Release(1);
} }