Skip to content

Commit

Permalink
Decouple the logger
Browse files Browse the repository at this point in the history
  • Loading branch information
lnauta committed Aug 12, 2024
1 parent ccdd168 commit f3c97d2
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
10 changes: 0 additions & 10 deletions picas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"""

import logging
from .documents import Document, Task, Job, User
from .clients import CouchDB
from .iterators import (ViewIterator, TaskViewIterator, EndlessViewIterator,
Expand All @@ -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',
Expand Down
1 change: 1 addition & 0 deletions picas/actors.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"""
from .util import Timer
from .iterators import TaskViewIterator
from .picaslogger import picaslogger

from couchdb.http import ResourceConflict

Expand Down
4 changes: 2 additions & 2 deletions picas/clients.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):

Expand Down
7 changes: 5 additions & 2 deletions picas/iterators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
18 changes: 18 additions & 0 deletions picas/picaslogger.py
Original file line number Diff line number Diff line change
@@ -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)

1 change: 1 addition & 0 deletions picas/srm.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from os import path

from .executers import execute, execute_old
from .picaslogger import picaslogger


def download(remotefile, local_dir):
Expand Down
1 change: 1 addition & 0 deletions picas/srmclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import queue

from picas import SRMClient
from .picaslogger import picaslogger


def download(files, threads=10):
Expand Down

0 comments on commit f3c97d2

Please sign in to comment.