From f808dd131bf53bc0f7466a05d7bb58f3344e5cb4 Mon Sep 17 00:00:00 2001 From: rembo10 Date: Sat, 16 May 2015 19:40:13 -0700 Subject: [PATCH] Fixed a couple log messages in sab.py to make it a little less redundant and fixed some log grammar in requests.py --- headphones/request.py | 2 +- headphones/sab.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/headphones/request.py b/headphones/request.py index f8e9ca8a..a8b9e84d 100644 --- a/headphones/request.py +++ b/headphones/request.py @@ -95,7 +95,7 @@ def request_response(url, method="get", auto_raise=True, "host is up and running.") except requests.Timeout: logger.error( - "Request timed out. The remote host did not respond timely.") + "Request timed out. The remote host did not respond in a timely manner.") except requests.HTTPError as e: if e.response is not None: if e.response.status_code >= 500: diff --git a/headphones/sab.py b/headphones/sab.py index 23669110..681906e3 100644 --- a/headphones/sab.py +++ b/headphones/sab.py @@ -48,14 +48,13 @@ def sab_api_call(request_type=None, params={}, **kwargs): params['output']='json' - logger.info("Attempting to connect to SABnzbd on url: %s" % url) response = request.request_json(url, params=params, **kwargs) if not response: - logger.error("Error connecting to SABnzbd on url: %s" % url) + logger.error("Error connecting to SABnzbd on url: %s" % headphones.CONFIG.SAB_HOST) return False else: - logger.info("Successfully connected to SABnzbd on url: %s" % url) + logger.info("Successfully connected to SABnzbd on url: %s" % headphones.CONFIG.SAB_HOST) return response def sendNZB(nzb):