diff --git a/src/launchpad/analyzers/apple.py b/src/launchpad/analyzers/apple.py index f728bd86..0b4c01c0 100644 --- a/src/launchpad/analyzers/apple.py +++ b/src/launchpad/analyzers/apple.py @@ -10,12 +10,10 @@ import lief -from launchpad.artifacts.apple.zipped_xcarchive import ZippedXCArchive -from launchpad.artifacts.artifact import AppleArtifact -from launchpad.insights.common import DuplicateFilesInsight, InsightsInput -from launchpad.models.apple import AppleInsightResults - +from ..artifacts import AppleArtifact, ZippedXCArchive +from ..insights.common import DuplicateFilesInsight, InsightsInput from ..models import AppleAnalysisResults, AppleAppInfo, FileAnalysis, FileInfo, MachOBinaryAnalysis +from ..models.apple import AppleInsightResults from ..models.treemap import FILE_TYPE_TO_TREEMAP_TYPE, TreemapType from ..parsers.apple.macho_parser import MachOParser from ..parsers.apple.range_mapping_builder import RangeMappingBuilder diff --git a/src/launchpad/artifacts/android/apk.py b/src/launchpad/artifacts/android/apk.py index c51f4023..25566118 100644 --- a/src/launchpad/artifacts/android/apk.py +++ b/src/launchpad/artifacts/android/apk.py @@ -2,16 +2,17 @@ from __future__ import annotations -import logging from pathlib import Path +from launchpad.utils.logging import get_logger + from ..artifact import AndroidArtifact from ..providers.zip_provider import ZipProvider from .manifest.axml import AxmlUtils from .manifest.manifest import AndroidManifest from .resources.binary import BinaryResourceTable -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class APK(AndroidArtifact): diff --git a/src/launchpad/artifacts/android/manifest/axml.py b/src/launchpad/artifacts/android/manifest/axml.py index e3399a57..04b55c38 100644 --- a/src/launchpad/artifacts/android/manifest/axml.py +++ b/src/launchpad/artifacts/android/manifest/axml.py @@ -2,16 +2,16 @@ from __future__ import annotations -import logging from dataclasses import dataclass from typing import Any, List, Sequence from launchpad.parsers.android.android_binary_parser import AndroidBinaryParser +from launchpad.utils.logging import get_logger from ..resources.binary import BinaryResourceTable from .manifest import AndroidApplication, AndroidManifest -logger = logging.getLogger(__name__) +logger = get_logger(__name__) @dataclass diff --git a/src/launchpad/artifacts/android/manifest/proto_xml.py b/src/launchpad/artifacts/android/manifest/proto_xml.py index 8dd09ace..16783093 100644 --- a/src/launchpad/artifacts/android/manifest/proto_xml.py +++ b/src/launchpad/artifacts/android/manifest/proto_xml.py @@ -1,14 +1,15 @@ from __future__ import annotations -import logging from typing import Any, Callable, List, Sequence +from launchpad.utils.logging import get_logger + from ..resources.proto import ProtobufResourceTable from ..resources.protos.Resources_pb2 import XmlAttribute, XmlElement # type: ignore[attr-defined] from ..resources.protos.Resources_pb2 import XmlNode as PbXmlNode # type: ignore[attr-defined] from .manifest import AndroidApplication, AndroidManifest, DeliveryType -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class ProtoXmlUtils: diff --git a/src/launchpad/artifacts/android/resources/proto.py b/src/launchpad/artifacts/android/resources/proto.py index db32975a..336b33ac 100644 --- a/src/launchpad/artifacts/android/resources/proto.py +++ b/src/launchpad/artifacts/android/resources/proto.py @@ -1,11 +1,11 @@ -import logging +from launchpad.utils.logging import get_logger from .protos.Resources_pb2 import Type # type: ignore[attr-defined] from .protos.Resources_pb2 import Entry, Package # type: ignore[attr-defined] from .protos.Resources_pb2 import ResourceTable as PBResourceTable # type: ignore[attr-defined] from .resource_table import DEFAULT_PACKAGE_ID, ResourceTable -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class ProtobufResourceTable(ResourceTable): diff --git a/src/launchpad/artifacts/apple/zipped_xcarchive.py b/src/launchpad/artifacts/apple/zipped_xcarchive.py index dee57ca3..869712ee 100644 --- a/src/launchpad/artifacts/apple/zipped_xcarchive.py +++ b/src/launchpad/artifacts/apple/zipped_xcarchive.py @@ -1,12 +1,13 @@ -import logging import plistlib from pathlib import Path from typing import Any +from launchpad.utils.logging import get_logger + from ..artifact import AppleArtifact from ..providers.zip_provider import ZipProvider -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class ZippedXCArchive(AppleArtifact): diff --git a/src/launchpad/kafka.py b/src/launchpad/kafka.py index cc955f13..bd2bb37c 100644 --- a/src/launchpad/kafka.py +++ b/src/launchpad/kafka.py @@ -4,7 +4,6 @@ import asyncio import json -import logging import os import time from typing import Any, Callable, Dict, List, Mapping, Optional, Sequence @@ -18,7 +17,9 @@ from confluent_kafka import KafkaError, KafkaException from confluent_kafka.admin import AdminClient, NewTopic -logger = logging.getLogger(__name__) +from launchpad.utils.logging import get_logger + +logger = get_logger(__name__) def ensure_topics_exist( diff --git a/src/launchpad/parsers/buffer_wrapper.py b/src/launchpad/parsers/buffer_wrapper.py index f8a65bf5..28a93bb0 100644 --- a/src/launchpad/parsers/buffer_wrapper.py +++ b/src/launchpad/parsers/buffer_wrapper.py @@ -2,12 +2,13 @@ from __future__ import annotations -import logging import struct import types from dataclasses import dataclass -logger = logging.getLogger(__name__) +from launchpad.utils.logging import get_logger + +logger = get_logger(__name__) @dataclass diff --git a/src/launchpad/server.py b/src/launchpad/server.py index 9aa27acd..9d603374 100644 --- a/src/launchpad/server.py +++ b/src/launchpad/server.py @@ -11,7 +11,9 @@ from aiohttp.typedefs import Handler from aiohttp.web import Application, Request, Response, StreamResponse, middleware -logger = logging.getLogger(__name__) +from launchpad.utils.logging import get_logger + +logger = get_logger(__name__) @middleware diff --git a/src/launchpad/service.py b/src/launchpad/service.py index 2233e313..6d3ad652 100644 --- a/src/launchpad/service.py +++ b/src/launchpad/service.py @@ -3,15 +3,16 @@ from __future__ import annotations import asyncio -import logging import signal from concurrent.futures import ThreadPoolExecutor from typing import Any, Dict, Union +from launchpad.utils.logging import get_logger + from .kafka import KafkaConsumer, LaunchpadMessage, get_kafka_config from .server import LaunchpadServer, get_server_config -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class LaunchpadService: