From f3c97d21efc1d443ed12fe2ae2163e9cb0cd26cf Mon Sep 17 00:00:00 2001
From: Lodewijk Nauta <lodewijk.nauta@surf.nl>
Date: Mon, 12 Aug 2024 12:20:46 +0200
Subject: [PATCH] Decouple the logger

---
 picas/__init__.py    | 10 ----------
 picas/actors.py      |  1 +
 picas/clients.py     |  4 ++--
 picas/iterators.py   |  7 +++++--
 picas/picaslogger.py | 18 ++++++++++++++++++
 picas/srm.py         |  1 +
 picas/srmclient.py   |  1 +
 7 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 picas/picaslogger.py

diff --git a/picas/__init__.py b/picas/__init__.py
index 87be019..d674ab3 100644
--- a/picas/__init__.py
+++ b/picas/__init__.py
@@ -11,7 +11,6 @@
 
 """
 
-import logging
 from .documents import Document, Task, Job, User
 from .clients import CouchDB
 from .iterators import (ViewIterator, TaskViewIterator, EndlessViewIterator,
@@ -21,15 +20,6 @@
 
 version = "0.3.0"
 
-picaslogger = logging.getLogger("PiCaS")
-formatter = logging.Formatter(
-            '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
-ch.setFormatter(formatter)
-picaslogger.addHandler(ch)
-picaslogger.setLevel(logging.INFO)
-
 __all__ = [
     'CouchDB',
     'Document',
diff --git a/picas/actors.py b/picas/actors.py
index 58f2dda..e629aab 100644
--- a/picas/actors.py
+++ b/picas/actors.py
@@ -6,6 +6,7 @@
 """
 from .util import Timer
 from .iterators import TaskViewIterator
+from .picaslogger import picaslogger
 
 from couchdb.http import ResourceConflict
 
diff --git a/picas/clients.py b/picas/clients.py
index 59eb0e3..9a0b50b 100644
--- a/picas/clients.py
+++ b/picas/clients.py
@@ -10,12 +10,12 @@
 import random
 import sys
 
-# Couchdb imports
 import couchdb
-from .documents import Document
 from couchdb.design import ViewDefinition
 from couchdb.http import ResourceConflict
 
+from .documents import Document
+from .picaslogger import picaslogger
 
 class CouchDB(object):
 
diff --git a/picas/iterators.py b/picas/iterators.py
index a930414..92cd5d2 100644
--- a/picas/iterators.py
+++ b/picas/iterators.py
@@ -5,10 +5,13 @@
 @Copyright (c) 2016, Jan Bot
 """
 
-from .documents import Task
-from couchdb.http import ResourceConflict
 import time
 
+from couchdb.http import ResourceConflict
+
+from .documents import Task
+from .picaslogger import picaslogger
+
 
 class ViewIterator(object):
     """
diff --git a/picas/picaslogger.py b/picas/picaslogger.py
new file mode 100644
index 0000000..3e90c71
--- /dev/null
+++ b/picas/picaslogger.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+"""
+@licence: The MIT License (MIT)
+@Copyright (c) 2016, Jan Bot
+@author: Lodewijk Nauta
+"""
+
+import logging
+
+picaslogger = logging.getLogger("PiCaS")
+formatter = logging.Formatter(
+            '%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+ch = logging.StreamHandler()
+ch.setLevel(logging.DEBUG)
+ch.setFormatter(formatter)
+picaslogger.addHandler(ch)
+picaslogger.setLevel(logging.INFO)
+
diff --git a/picas/srm.py b/picas/srm.py
index bc26331..e3e4bc5 100644
--- a/picas/srm.py
+++ b/picas/srm.py
@@ -13,6 +13,7 @@
 from os import path
 
 from .executers import execute, execute_old
+from .picaslogger import picaslogger
 
 
 def download(remotefile, local_dir):
diff --git a/picas/srmclient.py b/picas/srmclient.py
index fd949bc..1dbb3dc 100644
--- a/picas/srmclient.py
+++ b/picas/srmclient.py
@@ -11,6 +11,7 @@
 import queue
 
 from picas import SRMClient
+from .picaslogger import picaslogger
 
 
 def download(files, threads=10):