Skip to content

Commit 8d467bf

Browse files
authored
Merge pull request #166 from mz-ko/master
test: add debug codes for alert-manager
2 parents a6e8b13 + 0a22a8e commit 8d467bf

File tree

2 files changed

+32
-4
lines changed

2 files changed

+32
-4
lines changed

src/spaceone/core/connector/space_connector.py

+9
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ def client(self) -> GRPCClient:
4444
return self._client
4545

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

4950
def _call_api(
@@ -55,15 +56,23 @@ def _call_api(
5556
x_workspace_id: str = None,
5657
) -> Any:
5758
resource, verb = self._parse_method(method)
59+
_LOGGER.debug(f"space_connector.dispatch :: resource: {resource}, verb: {verb}")
60+
5861
self._check_method(resource, verb)
5962

6063
params = params or {}
64+
_LOGGER.debug(f"space_connector.dispatch :: params: {params}")
6165
metadata = self._get_connection_metadata(token, x_domain_id, x_workspace_id)
66+
_LOGGER.debug(f"space_connector.dispatch :: metadata: {metadata}")
6267

6368
response_or_iterator = getattr(getattr(self._client, resource), verb)(
6469
params, metadata=metadata
6570
)
6671

72+
_LOGGER.debug(
73+
f"space_connector.dispatch :: response_or_iterator: {response_or_iterator}"
74+
)
75+
6776
if self._return_type == "dict":
6877
if isinstance(response_or_iterator, types.GeneratorType):
6978
return self._generate_response(response_or_iterator)

src/spaceone/core/pygrpc/client.py

+23-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import types
33
import grpc
44
from google.protobuf.json_format import ParseDict
5-
from google.protobuf.message_factory import MessageFactory #, GetMessageClass
5+
from google.protobuf.message_factory import MessageFactory # , GetMessageClass
66
from google.protobuf.descriptor_pool import DescriptorPool
77
from google.protobuf.descriptor import ServiceDescriptor, MethodDescriptor
88
from grpc_reflection.v1alpha.proto_reflection_descriptor_database import (
@@ -109,16 +109,24 @@ def _retry_call(
109109
):
110110
retries = 0
111111

112+
_LOGGER.debug(
113+
f"client._retry_call.init :: client_call_details: {client_call_details}"
114+
)
115+
112116
while True:
113117
try:
118+
_LOGGER.debug(f"client._retry_call.start!!!")
114119
response_or_iterator = continuation(
115120
client_call_details, request_or_iterator
116121
)
122+
_LOGGER.debug(f"client._retry_call.response_or_iterator Success!!!")
117123

118124
if is_stream:
119125
response_or_iterator = self._generate_response(response_or_iterator)
120126
else:
127+
_LOGGER.debug(f"client._retry_call.start _check_error!!!")
121128
self._check_error(response_or_iterator)
129+
_LOGGER.debug(f"client._retry_call.finished _check_error!!!")
122130

123131
return response_or_iterator
124132

@@ -207,13 +215,17 @@ def _bind_grpc_method(
207215
request_desc = self._desc_pool.FindMessageTypeByName(
208216
method_desc.input_type.full_name
209217
)
210-
request_message_desc = MessageFactory(self._desc_pool).GetPrototype(request_desc)
218+
request_message_desc = MessageFactory(self._desc_pool).GetPrototype(
219+
request_desc
220+
)
211221
# request_message_desc = GetMessageClass(request_desc)
212222

213223
response_desc = self._desc_pool.FindMessageTypeByName(
214224
method_desc.output_type.full_name
215225
)
216-
response_message_desc = MessageFactory(self._desc_pool).GetPrototype(response_desc)
226+
response_message_desc = MessageFactory(self._desc_pool).GetPrototype(
227+
response_desc
228+
)
217229
# response_message_desc = GetMessageClass(response_desc)
218230

219231
if method_desc.client_streaming and method_desc.server_streaming:
@@ -286,7 +298,9 @@ def _init_grpc_reflection(self):
286298
request_desc = self._desc_pool.FindMessageTypeByName(
287299
method_desc.input_type.full_name
288300
)
289-
self._request_map[method_key] = MessageFactory(self._desc_pool).GetPrototype(request_desc)
301+
self._request_map[method_key] = MessageFactory(
302+
self._desc_pool
303+
).GetPrototype(request_desc)
290304
# self._request_map[method_key] = GetMessageClass(request_desc)
291305

292306
if service_desc.name not in self._api_resources:
@@ -324,6 +338,11 @@ def client(endpoint=None, ssl_enabled=False, max_message_length=None, **client_o
324338
if endpoint is None:
325339
raise Exception("Client's endpoint is undefined.")
326340

341+
_LOGGER.debug(f"pygrpc.client :: endpoint: {endpoint}")
342+
_LOGGER.debug(
343+
f"pygrpc.client :: _GRPC_CHANNEL: {_GRPC_CHANNEL} / is in? {endpoint in _GRPC_CHANNEL}"
344+
)
345+
327346
if endpoint not in _GRPC_CHANNEL:
328347
options = []
329348

0 commit comments

Comments
 (0)