From 9a15f8a96528fd2297ab488efbe2e6613fe0cee3 Mon Sep 17 00:00:00 2001 From: Kayomani Date: Wed, 22 Jul 2015 23:48:02 +0100 Subject: [PATCH] Couple of bugfixes --- src/Jackett/Controllers/APIController.cs | 10 +++++----- src/Jackett/Services/ServerService.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Jackett/Controllers/APIController.cs b/src/Jackett/Controllers/APIController.cs index fd4f64918..8b28ef0bc 100644 --- a/src/Jackett/Controllers/APIController.cs +++ b/src/Jackett/Controllers/APIController.cs @@ -34,11 +34,6 @@ namespace Jackett.Controllers var indexer = indexerService.GetIndexer(indexerName); var torznabQuery = TorznabQuery.FromHttpQuery(HttpUtility.ParseQueryString(Request.RequestUri.Query)); - if (!string.Equals(torznabQuery.ApiKey, serverService.Config.APIKey, StringComparison.InvariantCultureIgnoreCase)) - { - return Request.CreateResponse(HttpStatusCode.Forbidden, "Incorrect API key"); - } - if (string.Equals(torznabQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase)) { return new HttpResponseMessage() @@ -47,6 +42,11 @@ namespace Jackett.Controllers }; } + if (!string.Equals(torznabQuery.ApiKey, serverService.Config.APIKey, StringComparison.InvariantCultureIgnoreCase)) + { + return Request.CreateResponse(HttpStatusCode.Forbidden, "Incorrect API key"); + } + var releases = await indexer.PerformQuery(torznabQuery); logger.Info(string.Format("Found {0} releases from {1}", releases.Length, indexer.DisplayName)); diff --git a/src/Jackett/Services/ServerService.cs b/src/Jackett/Services/ServerService.cs index 826e216de..3ac03aaa0 100644 --- a/src/Jackett/Services/ServerService.cs +++ b/src/Jackett/Services/ServerService.cs @@ -115,7 +115,7 @@ namespace Jackett.Services public void Start() { // Start the server - logger.Debug("Starting web server at " + config.GetListenAddresses()[0]); + logger.Info("Starting web server at " + config.GetListenAddresses()[0]); var startOptions = new StartOptions(); config.GetListenAddresses().ToList().ForEach(u => startOptions.Urls.Add(u)); _server = WebApp.Start(startOptions);