Fix logging output

pull/8147/head
Shadowghost 3 years ago
parent b5c1d6129e
commit cea8e8bbf6

@ -307,7 +307,7 @@ namespace Emby.Dlna.Main
var fullService = "urn:schemas-upnp-org:device:MediaServer:1"; var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
_logger.LogInformation("Registering publisher for {ResourceName} on {DeviceAddress}", fullService, address); _logger.LogInformation("Registering publisher for {ResourceName} on {DeviceAddress}", fullService, address.Address);
var uri = new UriBuilder(_appHost.GetApiUrlForLocalAccess(address.Address, false) + descriptorUri); var uri = new UriBuilder(_appHost.GetApiUrlForLocalAccess(address.Address, false) + descriptorUri);

@ -933,22 +933,27 @@ namespace Jellyfin.Networking.Manager
.OrderBy(x => x.Index) .OrderBy(x => x.Index)
.ToList(); .ToList();
if (isInExternalSubnet && externalInterfaces.Any()) if (isInExternalSubnet)
{ {
// Check to see if any of the external bind interfaces are in the same subnet as the source. if (externalInterfaces.Any())
// If none exists, this will select the first external interface if there is one.
bindAddress = externalInterfaces
.OrderByDescending(x => x.Subnet.Contains(source))
.ThenBy(x => x.Index)
.Select(x => x.Address)
.FirstOrDefault();
if (bindAddress != null)
{ {
result = NetworkExtensions.FormatIpString(bindAddress); // Check to see if any of the external bind interfaces are in the same subnet as the source.
_logger.LogDebug("{Source}: GetBindInterface: Has source, found a matching external bind interface. {Result}", source, result); // If none exists, this will select the first external interface if there is one.
return true; bindAddress = externalInterfaces
.OrderByDescending(x => x.Subnet.Contains(source))
.ThenBy(x => x.Index)
.Select(x => x.Address)
.FirstOrDefault();
if (bindAddress != null)
{
result = NetworkExtensions.FormatIpString(bindAddress);
_logger.LogDebug("{Source}: GetBindInterface: Has source, found a matching external bind interface. {Result}", source, result);
return true;
}
} }
_logger.LogWarning("{Source}: External request received, no external interface bind found, trying internal interfaces.", source);
} }
else else
{ {
@ -963,7 +968,7 @@ namespace Jellyfin.Networking.Manager
if (bindAddress != null) if (bindAddress != null)
{ {
result = NetworkExtensions.FormatIpString(bindAddress); result = NetworkExtensions.FormatIpString(bindAddress);
_logger.LogWarning("{Source}: External request received, only an internal interface bind found. {Result}", source, result); _logger.LogWarning("{Source}: Request received, matching internal interface bind found. {Result}", source, result);
return true; return true;
} }
} }

Loading…
Cancel
Save