From 62a9e676bf4ff6f2f0f21679242175bc7dd989c9 Mon Sep 17 00:00:00 2001 From: tomkat83 Date: Tue, 30 Aug 2016 15:55:13 +0200 Subject: [PATCH] Merge conflicts image_cache_thread.py --- resources/lib/image_cache_thread.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/lib/image_cache_thread.py b/resources/lib/image_cache_thread.py index 1f2c51eb..e0714e93 100644 --- a/resources/lib/image_cache_thread.py +++ b/resources/lib/image_cache_thread.py @@ -11,12 +11,11 @@ import requests.packages.urllib3 requests.packages.urllib3.disable_warnings() ################################################################################################# -log = logging.getLogger("EMBY."+__name__) +log = logging.getLogger("PLEX."+__name__) ################################################################################################# -@utils.logging class ImageCacheThread(threading.Thread): url_to_process = None