Skip to content

test: rollback loggers #167

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

Merged
merged 2 commits into from
Mar 17, 2025
Merged

test: rollback loggers #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1aa2d
test: rollback loggers
mz-ko Mar 17, 2025
773b5c5
Merge branch 'cloudforet-io:master' into master
mz-ko Mar 17, 2025
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
9 changes: 0 additions & 9 deletions src/spaceone/core/connector/space_connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def client(self) -> GRPCClient:
return self._client

def dispatch(self, method: str, params: dict = None, **kwargs) -> Any:
_LOGGER.debug(f"space_connector.dispatch : method: {method}")
return self._call_api(method, params, **kwargs)

def _call_api(
Expand All @@ -56,23 +55,15 @@ def _call_api(
x_workspace_id: str = None,
) -> Any:
resource, verb = self._parse_method(method)
_LOGGER.debug(f"space_connector.dispatch :: resource: {resource}, verb: {verb}")

self._check_method(resource, verb)

params = params or {}
_LOGGER.debug(f"space_connector.dispatch :: params: {params}")
metadata = self._get_connection_metadata(token, x_domain_id, x_workspace_id)
_LOGGER.debug(f"space_connector.dispatch :: metadata: {metadata}")

response_or_iterator = getattr(getattr(self._client, resource), verb)(
params, metadata=metadata
)

_LOGGER.debug(
f"space_connector.dispatch :: response_or_iterator: {response_or_iterator}"
)

if self._return_type == "dict":
if isinstance(response_or_iterator, types.GeneratorType):
return self._generate_response(response_or_iterator)
Expand Down
13 changes: 0 additions & 13 deletions src/spaceone/core/pygrpc/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,24 +109,16 @@ def _retry_call(
):
retries = 0

_LOGGER.debug(
f"client._retry_call.init :: client_call_details: {client_call_details}"
)

while True:
try:
_LOGGER.debug(f"client._retry_call.start!!!")
response_or_iterator = continuation(
client_call_details, request_or_iterator
)
_LOGGER.debug(f"client._retry_call.response_or_iterator Success!!!")

if is_stream:
response_or_iterator = self._generate_response(response_or_iterator)
else:
_LOGGER.debug(f"client._retry_call.start _check_error!!!")
self._check_error(response_or_iterator)
_LOGGER.debug(f"client._retry_call.finished _check_error!!!")

return response_or_iterator

Expand Down Expand Up @@ -338,11 +330,6 @@ def client(endpoint=None, ssl_enabled=False, max_message_length=None, **client_o
if endpoint is None:
raise Exception("Client's endpoint is undefined.")

_LOGGER.debug(f"pygrpc.client :: endpoint: {endpoint}")
_LOGGER.debug(
f"pygrpc.client :: _GRPC_CHANNEL: {_GRPC_CHANNEL} / is in? {endpoint in _GRPC_CHANNEL}"
)

if endpoint not in _GRPC_CHANNEL:
options = []

Expand Down
Loading