Skip to content

suggested logging changes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fcollman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

suggested logging changes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions skeletonservice/datasets/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,10 +509,10 @@ def process(datastack_name: str, skvn: int, rid: int):

c = MessagingClient()
exchange = os.getenv("SKELETON_CACHE_HIGH_PRIORITY_EXCHANGE", "skeleton")
print(f"SkeletonService sending payload for rid {rid} to exchange {exchange}")
current_app.logger.info(f"SkeletonService sending payload for rid {rid} to exchange {exchange}")
c.publish(exchange, payload, attributes)

print(f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}")
current_app.logger.info(f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}")
return f"Message has been dispatched to {exchange}: {datastack_name} {rid} skvn:{skvn} {current_app.config['SKELETON_CACHE_BUCKET']}"

# @auth_required
Expand Down
8 changes: 5 additions & 3 deletions skeletonservice/datasets/messaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
import traceback as tb
from messagingclient import MessagingClient
from .service import SkeletonService
import logging
logger = logging.getLogger(__name__)

def callback(payload):
s = ""
for k in payload.attributes:
s += f"\n__{k}: {payload.attributes[k]}"
print("Skeleton Cache message-processor received message: ", s)
logger.info("Skeleton Cache message-processor received message: ", s)
try:
# NOTE: Forrest indicates I am shooting for something like the following once fully implemented.
# SkelClassVsn = current_app.config['SKELETON_VERSION_ENGINES'][int(payload.attributes["skeleton_version"])]
Expand All @@ -24,9 +26,9 @@ def callback(payload):
False, # via_requests
int(payload.attributes["verbose_level"]),
)
print("Skeleton Cache message-processor returned from SkeletonService.get_skeleton_by_datastack_and_rid() with result: ", result)
logger.info("Skeleton Cache message-processor returned from SkeletonService.get_skeleton_by_datastack_and_rid() with result: ", result)
except Exception as e:
print("Skeleton Cache message-processor received error from SkeletonService.get_skeleton_by_datastack_and_rid(): ", repr(e))
logger.error("Skeleton Cache message-processor received error from SkeletonService.get_skeleton_by_datastack_and_rid(): ", repr(e))
print(tb.format_exc())
raise e

Expand Down
106 changes: 44 additions & 62 deletions skeletonservice/datasets/service.py
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions skeletonservice/datasets/service_skvn1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from typing import List, Union
from skeletonservice.datasets.service import SkeletonService
import logging

logger = logging.getLogger(__name__)

class SkeletonService_skvn1(SkeletonService):
def __init__(self):
super().__init__()
print("SkeletonService_skvn1 initialized")
logger.info("SkeletonService_skvn1 initialized")

@staticmethod
def get_cache_contents(
Expand All @@ -15,7 +17,7 @@ def get_cache_contents(
limit: int = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
logger.info(f"SkeletonService_skvn1.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
return SkeletonService.get_cache_contents(
bucket,
skeleton_version,
Expand All @@ -31,7 +33,7 @@ def skeletons_exist(
rids: Union[List, int] = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.skeletons_exist: {bucket} {skeleton_version} {rids}")
logger.info(f"SkeletonService_skvn1.skeletons_exist: {bucket} {skeleton_version} {rids}")
return SkeletonService.skeletons_exist(
bucket,
skeleton_version,
Expand All @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid(
via_requests: bool = True,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid(
datastack_name,
rid,
Expand All @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn1.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid_async(
datastack_name,
rid,
Expand All @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids(
generate_missing_skeletons: bool = False,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn1.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
return SkeletonService.get_skeletons_bulk_by_datastack_and_rids(
datastack_name,
rids,
Expand All @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn1.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn1.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async(
datastack_name,
rids,
Expand Down
16 changes: 9 additions & 7 deletions skeletonservice/datasets/service_skvn2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from typing import List, Union
from skeletonservice.datasets.service import SkeletonService
import logging

logger = logging.getLogger(__name__)

class SkeletonService_skvn2(SkeletonService):
def __init__(self):
super().__init__()
print("SkeletonService_skvn2 initialized")
logger.info("SkeletonService_skvn2 initialized")

@staticmethod
def get_cache_contents(
Expand All @@ -15,7 +17,7 @@ def get_cache_contents(
limit: int = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
logger.info(f"SkeletonService_skvn2.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
return SkeletonService.get_cache_contents(
bucket,
skeleton_version,
Expand All @@ -31,7 +33,7 @@ def skeletons_exist(
rids: Union[List, int] = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.skeletons_exist: {bucket} {skeleton_version} {rids}")
logger.info(f"SkeletonService_skvn2.skeletons_exist: {bucket} {skeleton_version} {rids}")
return SkeletonService.skeletons_exist(
bucket,
skeleton_version,
Expand All @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid(
via_requests: bool = True,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid(
datastack_name,
rid,
Expand All @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn2.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid_async(
datastack_name,
rid,
Expand All @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids(
generate_missing_skeletons: bool = False,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn2.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
return SkeletonService.get_skeletons_bulk_by_datastack_and_rids(
datastack_name,
rids,
Expand All @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn2.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn2.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async(
datastack_name,
rids,
Expand Down
16 changes: 9 additions & 7 deletions skeletonservice/datasets/service_skvn3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from typing import List, Union
from skeletonservice.datasets.service import SkeletonService
import logging

logger = logging.getLogger(__name__)

class SkeletonService_skvn3(SkeletonService):
def __init__(self):
super().__init__()
print("SkeletonService_skvn3 initialized")
logger.info("SkeletonService_skvn3 initialized")

@staticmethod
def get_cache_contents(
Expand All @@ -15,7 +17,7 @@ def get_cache_contents(
limit: int = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
logger.info(f"SkeletonService_skvn3.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
return SkeletonService.get_cache_contents(
bucket,
skeleton_version,
Expand All @@ -31,7 +33,7 @@ def skeletons_exist(
rids: Union[List, int] = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.skeletons_exist: {bucket} {skeleton_version} {rids}")
logger.info(f"SkeletonService_skvn3.skeletons_exist: {bucket} {skeleton_version} {rids}")
return SkeletonService.skeletons_exist(
bucket,
skeleton_version,
Expand All @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid(
via_requests: bool = True,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid(
datastack_name,
rid,
Expand All @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn3.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid_async(
datastack_name,
rid,
Expand All @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids(
generate_missing_skeletons: bool = False,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn3.get_skeletons_bulk_by_datastack_and_rids: {datastack_name} {rids} {bucket}")
return SkeletonService.get_skeletons_bulk_by_datastack_and_rids(
datastack_name,
rids,
Expand All @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn3.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn3.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async(
datastack_name,
rids,
Expand Down
16 changes: 9 additions & 7 deletions skeletonservice/datasets/service_skvn4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from typing import List, Union
from skeletonservice.datasets.service import SkeletonService
import logging

logger = logging.getLogger(__name__)

class SkeletonService_skvn4(SkeletonService):
def __init__(self):
super().__init__()
print("SkeletonService_skvn4 initialized")
logger.info("SkeletonService_skvn4 initialized")

@staticmethod
def get_cache_contents(
Expand All @@ -15,7 +17,7 @@ def get_cache_contents(
limit: int = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
logger.info(f"SkeletonService_skvn4.get_cache_contents: {bucket} {skeleton_version} {rid_prefixes} {limit}")
return SkeletonService.get_cache_contents(
bucket,
skeleton_version,
Expand All @@ -31,7 +33,7 @@ def skeletons_exist(
rids: Union[List, int] = None,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.skeletons_exist: {bucket} {skeleton_version} {rids}")
logger.info(f"SkeletonService_skvn4.skeletons_exist: {bucket} {skeleton_version} {rids}")
return SkeletonService.skeletons_exist(
bucket,
skeleton_version,
Expand All @@ -52,7 +54,7 @@ def get_skeleton_by_datastack_and_rid(
via_requests: bool = True,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid(
datastack_name,
rid,
Expand All @@ -78,7 +80,7 @@ def get_skeleton_by_datastack_and_rid_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid_async: {datastack_name} {rid} {output_format} {bucket}")
return SkeletonService.get_skeleton_by_datastack_and_rid_async(
datastack_name,
rid,
Expand All @@ -104,7 +106,7 @@ def get_skeletons_bulk_by_datastack_and_rids(
generate_missing_skeletons: bool = False,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn4.get_skeleton_by_datastack_and_rid: {datastack_name} {rids} {bucket}")
return SkeletonService.get_skeletons_bulk_by_datastack_and_rids(
datastack_name,
rids,
Expand All @@ -129,7 +131,7 @@ def generate_skeletons_bulk_by_datastack_and_rids_async(
skeleton_version: int = -1,
verbose_level_: int = 0,
):
print(f"SkeletonService_skvn4.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
logger.info(f"SkeletonService_skvn4.generate_skeletons_bulk_by_datastack_and_rids_async: {datastack_name} {rids} {bucket}")
return SkeletonService.generate_skeletons_bulk_by_datastack_and_rids_async(
datastack_name,
rids,
Expand Down