mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

core: increate httpclient timeout for update download. resolves #12711 (#12836) 

* Update download timeout => 100s => 300 s
This commit is contained in:
Diego Heras 2022-01-16 13:04:50 +01:00 committed by GitHub
parent f11bea6429
commit 4a6d630076
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Jackett.Common/Services/UpdateService.cs
View File

@ -44,6 +44,10 @@ namespace Jackett.Common.Services
filePermissionService = fps;
variant = new Variants().GetVariant();
// Increase the HTTP client timeout just for update download (not other requests)
// The update is heavy and can take longer time for slow connections. Fix #12711
client.SetTimeout(300); // 5 minutes
}
public void StartUpdateChecker() => Task.Factory.StartNew(UpdateWorkerThread);

3
src/Jackett.Common/Utils/Clients/HttpWebClient.cs
View File

@ -49,6 +49,8 @@ namespace Jackett.Common.Utils.Clients
return sslPolicyErrors == SslPolicyErrors.None;
}
public override void SetTimeout(int seconds) => ClientTimeout = seconds;
public override void Init()
{
base.Init();
@ -92,6 +94,7 @@ namespace Jackett.Common.Utils.Clients
clearanceHandlr.InnerHandler = clientHandlr;
using (var client = new HttpClient(clearanceHandlr))
{
client.Timeout = TimeSpan.FromSeconds(ClientTimeout);
using (var request = new HttpRequestMessage())
{
request.Headers.ExpectContinue = false;

8
src/Jackett.Common/Utils/Clients/HttpWebClient2.cs
View File

@ -77,6 +77,8 @@ namespace Jackett.Common.Utils.Clients
clearanceHandlr.InnerHandler = clientHandlr;
client = new HttpClient(clearanceHandlr);
SetTimeout(ClientTimeout);
}
// Called everytime the ServerConfig changes
@ -90,6 +92,12 @@ namespace Jackett.Common.Utils.Clients
}
}
public override void SetTimeout(int seconds)
{
ClientTimeout = seconds;
client.Timeout = TimeSpan.FromSeconds(ClientTimeout);
}
public override void Init()
{
base.Init();

3
src/Jackett.Common/Utils/Clients/WebClient.cs
View File

@ -25,6 +25,7 @@ namespace Jackett.Common.Utils.Clients
protected DateTime lastRequest = DateTime.MinValue;
protected TimeSpan requestDelayTimeSpan;
protected string ClientType;
protected int ClientTimeout = 100; // default timeout is 100 s
public bool EmulateBrowser = true;
protected static Dictionary<string, ICollection<string>> trustedCertificates = new Dictionary<string, ICollection<string>>();
@ -224,6 +225,8 @@ namespace Jackett.Common.Utils.Clients
InitProxy(serverConfig);
}
public virtual void SetTimeout(int seconds) => throw new NotImplementedException();
/**
* This method does the same as FormUrlEncodedContent but with custom encoding instead of utf-8
* https://stackoverflow.com/a/13832544