Skip to content

Commit 67a752d

Browse files
authored
Standardize logging impls (#49)
1 parent 1816387 commit 67a752d

File tree

10 files changed

+28
-22
lines changed

10 files changed

+28
-22
lines changed

src/launchpad/analyzers/apple.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@
1010

1111
import lief
1212

13-
from launchpad.artifacts.apple.zipped_xcarchive import ZippedXCArchive
14-
from launchpad.artifacts.artifact import AppleArtifact
15-
from launchpad.insights.common import DuplicateFilesInsight, InsightsInput
16-
from launchpad.models.apple import AppleInsightResults
17-
13+
from ..artifacts import AppleArtifact, ZippedXCArchive
14+
from ..insights.common import DuplicateFilesInsight, InsightsInput
1815
from ..models import AppleAnalysisResults, AppleAppInfo, FileAnalysis, FileInfo, MachOBinaryAnalysis
16+
from ..models.apple import AppleInsightResults
1917
from ..models.treemap import FILE_TYPE_TO_TREEMAP_TYPE, TreemapType
2018
from ..parsers.apple.macho_parser import MachOParser
2119
from ..parsers.apple.range_mapping_builder import RangeMappingBuilder

src/launchpad/artifacts/android/apk.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22

33
from __future__ import annotations
44

5-
import logging
65
from pathlib import Path
76

7+
from launchpad.utils.logging import get_logger
8+
89
from ..artifact import AndroidArtifact
910
from ..providers.zip_provider import ZipProvider
1011
from .manifest.axml import AxmlUtils
1112
from .manifest.manifest import AndroidManifest
1213
from .resources.binary import BinaryResourceTable
1314

14-
logger = logging.getLogger(__name__)
15+
logger = get_logger(__name__)
1516

1617

1718
class APK(AndroidArtifact):

src/launchpad/artifacts/android/manifest/axml.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
from __future__ import annotations
44

5-
import logging
65
from dataclasses import dataclass
76
from typing import Any, List, Sequence
87

98
from launchpad.parsers.android.android_binary_parser import AndroidBinaryParser
9+
from launchpad.utils.logging import get_logger
1010

1111
from ..resources.binary import BinaryResourceTable
1212
from .manifest import AndroidApplication, AndroidManifest
1313

14-
logger = logging.getLogger(__name__)
14+
logger = get_logger(__name__)
1515

1616

1717
@dataclass

src/launchpad/artifacts/android/manifest/proto_xml.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
from __future__ import annotations
22

3-
import logging
43
from typing import Any, Callable, List, Sequence
54

5+
from launchpad.utils.logging import get_logger
6+
67
from ..resources.proto import ProtobufResourceTable
78
from ..resources.protos.Resources_pb2 import XmlAttribute, XmlElement # type: ignore[attr-defined]
89
from ..resources.protos.Resources_pb2 import XmlNode as PbXmlNode # type: ignore[attr-defined]
910
from .manifest import AndroidApplication, AndroidManifest, DeliveryType
1011

11-
logger = logging.getLogger(__name__)
12+
logger = get_logger(__name__)
1213

1314

1415
class ProtoXmlUtils:

src/launchpad/artifacts/android/resources/proto.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import logging
1+
from launchpad.utils.logging import get_logger
22

33
from .protos.Resources_pb2 import Type # type: ignore[attr-defined]
44
from .protos.Resources_pb2 import Entry, Package # type: ignore[attr-defined]
55
from .protos.Resources_pb2 import ResourceTable as PBResourceTable # type: ignore[attr-defined]
66
from .resource_table import DEFAULT_PACKAGE_ID, ResourceTable
77

8-
logger = logging.getLogger(__name__)
8+
logger = get_logger(__name__)
99

1010

1111
class ProtobufResourceTable(ResourceTable):

src/launchpad/artifacts/apple/zipped_xcarchive.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import logging
21
import plistlib
32
from pathlib import Path
43
from typing import Any
54

5+
from launchpad.utils.logging import get_logger
6+
67
from ..artifact import AppleArtifact
78
from ..providers.zip_provider import ZipProvider
89

9-
logger = logging.getLogger(__name__)
10+
logger = get_logger(__name__)
1011

1112

1213
class ZippedXCArchive(AppleArtifact):

src/launchpad/kafka.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import asyncio
66
import json
7-
import logging
87
import os
98
import time
109
from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence
@@ -18,7 +17,9 @@
1817
from confluent_kafka import KafkaError, KafkaException
1918
from confluent_kafka.admin import AdminClient, NewTopic
2019

21-
logger = logging.getLogger(__name__)
20+
from launchpad.utils.logging import get_logger
21+
22+
logger = get_logger(__name__)
2223

2324

2425
def ensure_topics_exist(

src/launchpad/parsers/buffer_wrapper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
from __future__ import annotations
44

5-
import logging
65
import struct
76
import types
87
from dataclasses import dataclass
98

10-
logger = logging.getLogger(__name__)
9+
from launchpad.utils.logging import get_logger
10+
11+
logger = get_logger(__name__)
1112

1213

1314
@dataclass

src/launchpad/server.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
from aiohttp.typedefs import Handler
1212
from aiohttp.web import Application, Request, Response, StreamResponse, middleware
1313

14-
logger = logging.getLogger(__name__)
14+
from launchpad.utils.logging import get_logger
15+
16+
logger = get_logger(__name__)
1517

1618

1719
@middleware

src/launchpad/service.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
from __future__ import annotations
44

55
import asyncio
6-
import logging
76
import signal
87
from concurrent.futures import ThreadPoolExecutor
98
from typing import Any, Dict, Union
109

10+
from launchpad.utils.logging import get_logger
11+
1112
from .kafka import KafkaConsumer, LaunchpadMessage, get_kafka_config
1213
from .server import LaunchpadServer, get_server_config
1314

14-
logger = logging.getLogger(__name__)
15+
logger = get_logger(__name__)
1516

1617

1718
class LaunchpadService:

0 commit comments

Comments
 (0)