fergalmoran/DnsServer
1
0
Fork 0
mirror of https://github.com/fergalmoran/DnsServer.git synced 2026-01-06 08:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebServiceSettingsApi: updated restart web service code to pass old end points for reverting feature.

Browse Source
This commit is contained in:
Shreyas Zare
2023-08-26 12:36:30 +05:30
parent fccd8dd5fb
commit 574fe200da
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DnsServerCore/WebServiceSettingsApi.cs
View File

@@ -152,7 +152,7 @@ namespace DnsServerCore
#region private
private void RestartService(bool restartDnsService, bool restartWebService)
private void RestartService(bool restartDnsService, bool restartWebService, IReadOnlyList<IPAddress> oldWebServiceLocalAddresses, int oldWebServiceHttpPort, int oldWebServiceTlsPort)
{
if (restartDnsService)
{
@@ -185,7 +185,7 @@ namespace DnsServerCore
try
{
await _dnsWebService.StopWebServiceAsync();
await _dnsWebService.TryStartWebServiceAsync();
await _dnsWebService.TryStartWebServiceAsync(oldWebServiceLocalAddresses, oldWebServiceHttpPort, oldWebServiceTlsPort);
_dnsWebService._log.Write("Web service was restarted successfully.");
}
@@ -516,7 +516,9 @@ namespace DnsServerCore
bool restartDnsService = false;
bool restartWebService = false;
bool blockListUrlsUpdated = false;
IReadOnlyList<IPAddress> oldWebServiceLocalAddresses = _dnsWebService._webServiceLocalAddresses;
int oldWebServiceHttpPort = _dnsWebService._webServiceHttpPort;
int oldWebServiceTlsPort = _dnsWebService._webServiceTlsPort;
HttpRequest request = context.Request;
@@ -1256,7 +1258,7 @@ namespace DnsServerCore
Utf8JsonWriter jsonWriter = context.GetCurrentJsonWriter();
WriteDnsSettings(jsonWriter);
RestartService(restartDnsService, restartWebService);
RestartService(restartDnsService, restartWebService, oldWebServiceLocalAddresses, oldWebServiceHttpPort, oldWebServiceTlsPort);
}
public void GetTsigKeyNames(HttpContext context)
@@ -1522,6 +1524,10 @@ namespace DnsServerCore
if (!request.HasFormContentType || (request.Form.Files.Count == 0))
throw new DnsWebServiceException("DNS backup zip file is missing.");
IReadOnlyList<IPAddress> oldWebServiceLocalAddresses = _dnsWebService._webServiceLocalAddresses;
int oldWebServiceHttpPort = _dnsWebService._webServiceHttpPort;
int oldWebServiceTlsPort = _dnsWebService._webServiceTlsPort;
//write to temp file
string tmpFile = Path.GetTempFileName();
try
@@ -1842,7 +1848,7 @@ namespace DnsServerCore
}
if (dnsSettings)
RestartService(true, true);
RestartService(true, true, oldWebServiceLocalAddresses, oldWebServiceHttpPort, oldWebServiceTlsPort);
Utf8JsonWriter jsonWriter = context.GetCurrentJsonWriter();
WriteDnsSettings(jsonWriter);