Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2025-05-17 14:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update logging

Browse source 
Use the logging module. Moved logging to it's own file.
This commit is contained in:
angelblue05 2016-07-24 03:59:48 -05:00
parent 380fcdfc35
commit 76dfa1286c
26 changed files with 689 additions and 646 deletions
Download patch file Download diff file Expand all files Collapse all files

50
resources/lib/connect.py
View file

@ -7,7 +7,7 @@ import requests
import logging
import clientinfo
from utils import Logging, window
from utils import window
##################################################################################################
@ -15,7 +15,8 @@ from utils import Logging, window
from requests.packages.urllib3.exceptions import InsecureRequestWarning, InsecurePlatformWarning
requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
requests.packages.urllib3.disable_warnings(InsecurePlatformWarning)
#logging.getLogger('requests').setLevel(logging.WARNING)
log = logging.getLogger("EMBY."+__name__)
##################################################################################################
@ -25,7 +26,6 @@ class ConnectUtils():
# Borg - multiple instances, shared state
_shared_state = {}
clientInfo = clientinfo.ClientInfo()
addonName = clientInfo.getAddonName()
# Requests session
c = None
@ -34,26 +34,23 @@ class ConnectUtils():
def __init__(self):
global log
log = Logging(self.__class__.__name__).log
self.__dict__ = self._shared_state
def setUserId(self, userId):
# Reserved for userclient only
self.userId = userId
log("Set connect userId: %s" % userId, 2)
log.debug("Set connect userId: %s" % userId)
def setServer(self, server):
# Reserved for userclient only
self.server = server
log("Set connect server: %s" % server, 2)
log.debug("Set connect server: %s" % server)
def setToken(self, token):
# Reserved for userclient only
self.token = token
log("Set connect token: %s" % token, 2)
log.debug("Set connect token: %s" % token)
def startSession(self):
@ -71,7 +68,7 @@ class ConnectUtils():
if self.sslclient is not None:
verify = self.sslclient
except:
log("Could not load SSL settings.", 1)
log.info("Could not load SSL settings.")
# Start session
self.c = requests.Session()
@ -81,13 +78,13 @@ class ConnectUtils():
self.c.mount("http://", requests.adapters.HTTPAdapter(max_retries=1))
self.c.mount("https://", requests.adapters.HTTPAdapter(max_retries=1))
log("Requests session started on: %s" % self.server, 1)
log.info("Requests session started on: %s" % self.server)
def stopSession(self):
try:
self.c.close()
except Exception as e:
log("Requests session could not be terminated: %s" % e, 1)
except Exception:
log.warn("Requests session could not be terminated")
def getHeader(self, authenticate=True):
@ -101,7 +98,7 @@ class ConnectUtils():
'Content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
'Accept': "application/json"
}
log("Header: %s" % header, 1)
log.info("Header: %s" % header)
else:
token = self.token
@ -113,14 +110,14 @@ class ConnectUtils():
'X-Application': "Kodi/%s" % version,
'X-Connect-UserToken': token
}
log("Header: %s" % header, 1)
log.info("Header: %s" % header)
return header
def doUrl(self, url, data=None, postBody=None, rtype="GET",
parameters=None, authenticate=True, timeout=None):
log("=== ENTER connectUrl ===", 2)
log.debug("=== ENTER connectUrl ===")
default_link = ""
@ -207,25 +204,25 @@ class ConnectUtils():
verify=verifyssl)
##### THE RESPONSE #####
log(r.url, 1)
log(r, 1)
log.info(r.url)
log.info(r)
if r.status_code == 204:
# No body in the response
log("====== 204 Success ======", 1)
log.info("====== 204 Success ======")
elif r.status_code == requests.codes.ok:
try:
# UNICODE - JSON object
r = r.json()
log("====== 200 Success ======", 1)
log("Response: %s" % r, 1)
log.info("====== 200 Success ======")
log.info("Response: %s" % r)
return r
except:
if r.headers.get('content-type') != "text/html":
log("Unable to convert the response for: %s" % url, 1)
log.info("Unable to convert the response for: %s" % url)
else:
r.raise_for_status()
@ -236,8 +233,7 @@ class ConnectUtils():
pass
except requests.exceptions.ConnectTimeout as e:
log("Server timeout at: %s" % url, 0)
log(e, 1)
log.warn("Server timeout at: %s" % url)
except requests.exceptions.HTTPError as e:
@ -253,11 +249,9 @@ class ConnectUtils():
pass
except requests.exceptions.SSLError as e:
log("Invalid SSL certificate for: %s" % url, 0)
log(e, 1)
log.warn("Invalid SSL certificate for: %s" % url)
except requests.exceptions.RequestException as e:
log("Unknown error connecting to: %s" % url, 0)
log(e, 1)
log.warn("Unknown error connecting to: %s" % url)
return default_link