Skip to content

Commit 057fc2c

Browse files
committed
adjust logger
1 parent b4f55b8 commit 057fc2c

File tree

11 files changed

+44
-14
lines changed

11 files changed

+44
-14
lines changed

dataherb/cmd/configs.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
from loguru import logger
22
import json
3+
import sys
34
from pathlib import Path
45

6+
logger.remove()
7+
logger.add(sys.stderr, level="INFO", enqueue=True)
58

69
def load_dataherb_config(config_path=None):
710
"""Loads the dataherb config file.

dataherb/cmd/create.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
import os
1+
import os, sys
22
import click
33

44
import inquirer
55
from dataherb.parse.model_json import IGNORED_FOLDERS_AND_FILES
66
from loguru import logger
77

8+
logger.remove()
9+
logger.add(sys.stderr, level="INFO", enqueue=True)
810

911
def describe_file(file):
1012
"""

dataherb/command.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from genericpath import exists
21
import json
32
import os, sys
43
from pathlib import Path
@@ -19,6 +18,9 @@
1918
from dataherb.parse.model_json import STATUS_CODE, MetaData
2019
from dataherb.serve.save_mkdocs import SaveMkDocs
2120

21+
logger.remove()
22+
logger.add(sys.stderr, level="INFO", enqueue=True)
23+
2224
__CWD__ = os.getcwd()
2325

2426

@@ -330,6 +332,7 @@ def echo_summary(key, value_dict, bg=None, fg=None):
330332

331333

332334

335+
333336
if __name__ == "__main__":
334337
fl = Flora()
335338
pass

dataherb/core/base.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
from datapackage import Package, Resource
1111
from loguru import logger
1212
from rapidfuzz import fuzz
13+
import sys
14+
15+
logger.remove()
16+
logger.add(sys.stderr, level="INFO", enqueue=True)
1317

1418

1519
class Herb(object):

dataherb/fetch/remote.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
import json
2-
import logging
3-
import os
1+
from loguru import logger
2+
import os, sys
43
import random
54

65
import requests
76
from requests.adapters import HTTPAdapter
87
from requests.packages.urllib3.util.retry import Retry
98

10-
logging.basicConfig()
11-
logger = logging.getLogger("fetch")
9+
logger.remove()
10+
logger.add(sys.stderr, level="INFO", enqueue=True)
1211

1312

1413
def random_user_agent():

dataherb/flora.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
import json
2+
import sys
23
from pathlib import Path
34

45
from loguru import logger
56

67
from dataherb.core.base import Herb
7-
from dataherb.core.search import search_by_ids_in_flora as _search_by_ids_in_flora
8-
from dataherb.core.search import (
9-
search_by_keywords_in_flora as _search_by_keywords_in_flora,
10-
)
8+
from dataherb.core.search import \
9+
search_by_ids_in_flora as _search_by_ids_in_flora
10+
from dataherb.core.search import \
11+
search_by_keywords_in_flora as _search_by_keywords_in_flora
1112
from dataherb.fetch.remote import get_data_from_url as _get_data_from_url
1213
from dataherb.parse.model_json import MetaData
1314

15+
logger.remove()
16+
logger.add(sys.stderr, level="INFO", enqueue=True)
17+
1418

1519
class Flora(object):
1620
"""

dataherb/parse/csv.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
from loguru import logger
22
from dataherb.parse.model import MetaData
3+
import sys
34

5+
logger.remove()
6+
logger.add(sys.stderr, level="INFO", enqueue=True)
47

58
if __name__ == "__main__":
69
logger.debug("End of Game")

dataherb/parse/model_json.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import csv
22
import json
3-
import os
3+
import os, sys
44
from collections import OrderedDict
55
from pathlib import Path
66

77
import ruamel.yaml
88
from loguru import logger
99
from ruamel.yaml.representer import RoundTripRepresenter
1010

11+
logger.remove()
12+
logger.add(sys.stderr, level="INFO", enqueue=True)
13+
1114
IGNORED_FOLDERS_AND_FILES = [".git", ".dataherb", ".vscode"]
1215

1316

dataherb/parse/model_yaml.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import csv
2-
import os
2+
import os, sys
33
from collections import OrderedDict
44
from pathlib import Path
55

66
import ruamel.yaml
77
from loguru import logger
88
from ruamel.yaml.representer import RoundTripRepresenter
99

10+
logger.remove()
11+
logger.add(sys.stderr, level="INFO", enqueue=True)
12+
1013
IGNORED_FOLDERS_AND_FILES = [".git", ".dataherb", ".vscode"]
1114

1215
# Add representer to ruamel.yaml for OrderedDict

dataherb/serve/models.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
from abc import abstractclassmethod
2+
import sys
23
from loguru import logger
34
from dataherb.flora import Flora
45

6+
logger.remove()
7+
logger.add(sys.stderr, level="INFO", enqueue=True)
58

69
class SourceModel:
710
"""

0 commit comments

Comments
 (0)