mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 11:57:55 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
f86e8a415a
2 changed files with 3 additions and 4 deletions
|
@ -52,6 +52,7 @@ namespace MediaBrowser.Common.Implementations.Security
|
||||||
{
|
{
|
||||||
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
|
//check the reg file first to alleviate strain on the MB admin server - must actually check in every 30 days tho
|
||||||
var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) };
|
var reg = new RegRecord { registered = LicenseFile.LastChecked(feature) > DateTime.UtcNow.AddDays(-30) };
|
||||||
|
var success = reg.registered;
|
||||||
|
|
||||||
if (!reg.registered)
|
if (!reg.registered)
|
||||||
{
|
{
|
||||||
|
@ -73,6 +74,7 @@ namespace MediaBrowser.Common.Implementations.Security
|
||||||
using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
|
using (var json = await httpClient.Post(MBValidateUrl, data, CancellationToken.None).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
reg = jsonSerializer.DeserializeFromStream<RegRecord>(json);
|
reg = jsonSerializer.DeserializeFromStream<RegRecord>(json);
|
||||||
|
success = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (reg.registered)
|
if (reg.registered)
|
||||||
|
@ -91,7 +93,7 @@ namespace MediaBrowser.Common.Implementations.Security
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true };
|
return new MBRegistrationRecord { IsRegistered = reg.registered, ExpirationDate = reg.expDate, RegChecked = true, RegError = !success};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -283,7 +283,4 @@ Global
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(Performance) = preSolution
|
|
||||||
HasPerformanceSessions = true
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
Loading…
Reference in a new issue