ref: add timeout for icon dl and don't force logging style on other libs

Author: paulmueller

dcoraid/__init__.py

@@ -1,14 +1,6 @@
 # flake8: noqa: F401
-import logging
-
 from . import api, dbmodel, download, upload
 from .api import CKANAPI
 from .dbmodel import APIInterrogator
 from .upload.task import create_task
 from ._version import version as __version__
-
-logging.basicConfig(
-    level=logging.INFO,
-    format="%(asctime)s %(levelname)s %(processName)s/%(threadName)s "
-           + "in %(name)s: %(message)s",
-    datefmt='%H:%M:%S')

dcoraid/__main__.py

@@ -1,9 +1,16 @@
 def main(splash=True):
+    import logging
     import os
     import pkg_resources
     import platform
     import sys
 
+    logging.basicConfig(
+        level=logging.INFO,
+        format="%(asctime)s %(levelname)s %(processName)s/%(threadName)s "
+               + "in %(name)s: %(message)s",
+        datefmt='%H:%M:%S')
+
     from PyQt5.QtWidgets import QApplication
 
     if platform.win32_ver()[0] == "7":

dcoraid/cli.py

@@ -1,5 +1,6 @@
 import argparse
 from argparse import RawTextHelpFormatter
+import logging
 import pathlib
 import threading
 import time
@@ -100,6 +101,12 @@ def upload_task(path_task=None, server=None, api_key=None, ret_job=False):
 
 
 def upload_task_parser():
+    logging.basicConfig(
+        level=logging.INFO,
+        format="%(asctime)s %(levelname)s %(processName)s/%(threadName)s "
+               + "in %(name)s: %(message)s",
+        datefmt='%H:%M:%S')
+
     descr = (
         "Upload a .dcoraid-task file to a DCOR instance. Example usage::\n"
         + "\n    dcoraid-upload-task upload_job.dcoraid-task "

dcoraid/img/icon-theme/collect_icons.py

@@ -129,7 +129,7 @@ def find_icons(name, theme):
         for topic in web_roots[theme]:
             filename = name + ".svg"
             url = web_roots[theme][topic]
-            response = requests.get(url + filename)
+            response = requests.get(url + filename, timeout=3.05)
             topic_dir = tmpdir / theme / topic
             topic_dir.mkdir(exist_ok=True, parents=True)
             if response.status_code == 200: