Fix: Redhat/NSS based libcurl not being able to access certain indexers

This commit is contained in:
KZ
2015-07-31 20:27:59 +01:00
parent 1606e3379f
commit 796bb70421
16 changed files with 144 additions and 182 deletions

View File

@@ -5,6 +5,7 @@ using Jackett.Services;
using Jackett.Utils;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NLog;
using System;
using System.Collections.Generic;
using System.IO;
@@ -34,8 +35,9 @@ namespace Jackett.Controllers
private ISecuityService securityService;
private IProcessService processService;
private ICacheService cacheService;
private Logger logger;
public AdminController(IConfigurationService config, IIndexerManagerService i, IServerService ss, ISecuityService s, IProcessService p, ICacheService c)
public AdminController(IConfigurationService config, IIndexerManagerService i, IServerService ss, ISecuityService s, IProcessService p, ICacheService c, Logger l)
{
this.config = config;
indexerService = i;
@@ -43,6 +45,7 @@ namespace Jackett.Controllers
securityService = s;
processService = p;
cacheService = c;
logger = l;
}
private async Task<JToken> ReadPostDataJson()
@@ -130,6 +133,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in SetAdminPassword");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -153,6 +157,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in GetConfigForm");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -185,6 +190,9 @@ namespace Jackett.Controllers
if (ex is ExceptionWithConfigData)
{
jsonReply["config"] = ((ExceptionWithConfigData)ex).ConfigData.ToJson();
} else
{
logger.Error(ex, "Exception in Configure");
}
}
return Json(jsonReply);
@@ -214,6 +222,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in get_indexers");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -235,6 +244,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in test_indexer");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -254,6 +264,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in delete_indexer");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -276,14 +287,9 @@ namespace Jackett.Controllers
jsonReply["config"] = cfg;
jsonReply["app_version"] = config.GetVersion();
jsonReply["result"] = "success";
}
catch (CustomException ex)
{
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
catch (Exception ex)
}catch (Exception ex)
{
logger.Error(ex, "Exception in get_jackett_config");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}
@@ -357,6 +363,7 @@ namespace Jackett.Controllers
}
catch (Exception ex)
{
logger.Error(ex, "Exception in set_port");
jsonReply["result"] = "error";
jsonReply["error"] = ex.Message;
}