Skip to content

Commit 7c6e7de

Browse files
yeasyyeasy
authored
Merge branch 'main' into feat/apple-silicon-support
2 parents 0452065 + d67c442 commit 7c6e7de

File tree

11 files changed

+79
-49
lines changed

11 files changed

+79
-49
lines changed

‎src/api-engine/api/lib/agent/docker/handler.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ def create(self, info):
5656
else:
5757
return None
5858
except Exception as e:
59+
LOG.exception("DockerAgent Not Created")
5960
raise e
6061

6162
def delete(self, *args, **kwargs):
@@ -66,6 +67,7 @@ def delete(self, *args, **kwargs):
6667
else:
6768
raise response.reason
6869
except Exception as e:
70+
LOG.exception("DockerAgent Not Deleted")
6971
raise e
7072

7173
def start(self, *args, **kwargs):
@@ -76,6 +78,7 @@ def start(self, *args, **kwargs):
7678
else:
7779
raise response.reason
7880
except Exception as e:
81+
LOG.exception("DockerAgent Not Started")
7982
raise e
8083

8184
def restart(self, *args, **kwargs):
@@ -86,6 +89,7 @@ def restart(self, *args, **kwargs):
8689
else:
8790
raise response.reason
8891
except Exception as e:
92+
LOG.exception("DockerAgent Not Restarted")
8993
raise e
9094

9195
def stop(self, *args, **kwargs):
@@ -96,6 +100,7 @@ def stop(self, *args, **kwargs):
96100
else:
97101
raise response.reason
98102
except Exception as e:
103+
LOG.exception("DockerAgent Not Stopped")
99104
raise e
100105

101106
def get(self, *args, **kwargs):
@@ -106,6 +111,7 @@ def get(self, *args, **kwargs):
106111
else:
107112
raise response.reason
108113
except Exception as e:
114+
LOG.exception("DockerAgent Not Found")
109115
raise e
110116

111117
def update_config(self, config_file, node_type):
@@ -123,4 +129,5 @@ def update_config(self, config_file, node_type):
123129
else:
124130
raise response.reason
125131
except Exception as e:
132+
LOG.exception("Config Update Failed")
126133
raise e

‎src/api-engine/api/routes/agent/views.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def retrieve(self, request, pk=None):
205205
if agent.type == HostType.Kubernetes.name.lower():
206206
k8s_config = KubernetesConfig.objects.get(agent=agent)
207207
except ObjectDoesNotExist:
208-
raise ResourceNotFound
208+
raise ResourceNotFound("Agent not found")
209209
else:
210210
data = agent.__dict__
211211
if k8s_config:
@@ -234,7 +234,7 @@ def update(self, request, pk=None):
234234
# organization = request.user.organization
235235
try:
236236
if Agent.objects.get(name=name):
237-
raise ResourceExists
237+
raise ResourceExists("Agent Exists")
238238
except ObjectDoesNotExist:
239239
pass
240240
Agent.objects.filter(id=pk).update(name=name)
@@ -266,7 +266,7 @@ def partial_update(self, request, pk=None):
266266
try:
267267
agent = Agent.objects.get(id=pk)
268268
except ObjectDoesNotExist:
269-
raise ResourceNotFound
269+
raise ResourceNotFound("Agent not found")
270270
else:
271271
if name:
272272
agent.name = name
@@ -308,10 +308,10 @@ def destroy(self, request, pk=None):
308308
else:
309309
raise CustomError("User can't delete agent！")
310310
except ObjectDoesNotExist:
311-
raise ResourceNotFound
311+
raise ResourceNotFound("Agent not found")
312312
else:
313313
if agent.node.count():
314-
raise ResourceInUse
314+
raise ResourceInUse("Agent in use")
315315
agent.delete()
316316

317317
return Response(ok(None), status=status.HTTP_202_ACCEPTED)
@@ -357,7 +357,7 @@ def apply(self, request):
357357
schedulable=True,
358358
).order_by("capacity")
359359
if len(agents) == 0:
360-
raise NoResource
360+
raise NoResource("No Agent")
361361

362362
agent = agents[0]
363363
agent.organization = request.user.organization
@@ -371,6 +371,7 @@ def apply(self, request):
371371
except NoResource as e:
372372
raise e
373373
except Exception as e:
374+
LOG.exception("Agent Not Applied")
374375
return Response(
375376
err(e.args), status=status.HTTP_400_BAD_REQUEST
376377
)
@@ -399,7 +400,7 @@ def release(self, request, pk=None):
399400
id=pk, organization=request.user.organization
400401
)
401402
except ObjectDoesNotExist:
402-
raise ResourceNotFound
403+
raise ResourceNotFound("Agent not found")
403404
else:
404405
agent.organization = None
405406
agent.save()

‎src/api-engine/api/routes/chaincode/views.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def _read_cc_pkg(self, pk, filename, ccpackage_path):
7070
chaincode.save()
7171

7272
except Exception as e:
73+
LOG.exception("Could not read Chaincode Package")
7374
raise e
7475

7576
@swagger_auto_schema(
@@ -208,6 +209,7 @@ def package(self, request):
208209
threading.Thread(target=self._read_cc_pkg,
209210
args=(uuid, file.name, ccpackage_path)).start()
210211
except Exception as e:
212+
LOG.exception("Failed Threading")
211213
raise e
212214

213215
return Response(
@@ -239,7 +241,7 @@ def install(self, request):
239241
org = request.user.organization
240242
qs = Node.objects.filter(type="peer", organization=org)
241243
if not qs.exists():
242-
raise ResourceNotFound
244+
raise ResourceNotFound("Peer Does Not Exist")
243245
peer_node = qs.first()
244246

245247
envs = init_env_vars(peer_node, org)
@@ -267,7 +269,7 @@ def query_installed(self, request):
267269
org = request.user.organization
268270
qs = Node.objects.filter(type="peer", organization=org)
269271
if not qs.exists():
270-
raise ResourceNotFound
272+
raise ResourceNotFound("Peer Does Not Exist")
271273
peer_node = qs.first()
272274
envs = init_env_vars(peer_node, org)
273275

@@ -297,7 +299,7 @@ def get_installed_package(self, request):
297299
org = request.user.organization
298300
qs = Node.objects.filter(type="peer", organization=org)
299301
if not qs.exists():
300-
raise ResourceNotFound
302+
raise ResourceNotFound("Peer Does Not Exist")
301303
peer_node = qs.first()
302304
envs = init_env_vars(peer_node, org)
303305

@@ -336,13 +338,13 @@ def approve_for_my_org(self, request):
336338
org = request.user.organization
337339
qs = Node.objects.filter(type="orderer", organization=org)
338340
if not qs.exists():
339-
raise ResourceNotFound
341+
raise ResourceNotFound("Orderer Does Not Exist")
340342
orderer_node = qs.first()
341343
orderer_url = orderer_node.name + "." + org.name.split(".", 1)[1] + ":" + str(7050)
342344

343345
qs = Node.objects.filter(type="peer", organization=org)
344346
if not qs.exists():
345-
raise ResourceNotFound
347+
raise ResourceNotFound("Peer Does Not Exist")
346348
peer_node = qs.first()
347349
envs = init_env_vars(peer_node, org)
348350

@@ -371,7 +373,7 @@ def query_approved(self, request):
371373
org = request.user.organization
372374
qs = Node.objects.filter(type="peer", organization=org)
373375
if not qs.exists():
374-
raise ResourceNotFound
376+
raise ResourceNotFound("Peer Does Not Exist")
375377
peer_node = qs.first()
376378
envs = init_env_vars(peer_node, org)
377379

@@ -414,7 +416,7 @@ def check_commit_readiness(self, request):
414416
org = request.user.organization
415417
qs = Node.objects.filter(type="orderer", organization=org)
416418
if not qs.exists():
417-
raise ResourceNotFound
419+
raise ResourceNotFound("Orderer Does Not Exist")
418420
orderer_node = qs.first()
419421

420422
orderer_tls_dir = "{}/{}/crypto-config/ordererOrganizations/{}/orderers/{}/msp/tlscacerts" \
@@ -428,7 +430,7 @@ def check_commit_readiness(self, request):
428430

429431
qs = Node.objects.filter(type="peer", organization=org)
430432
if not qs.exists():
431-
raise ResourceNotFound
433+
raise ResourceNotFound("Peer Does Not Exist")
432434
peer_node = qs.first()
433435
envs = init_env_vars(peer_node, org)
434436

@@ -470,7 +472,7 @@ def commit(self, request):
470472
org = request.user.organization
471473
qs = Node.objects.filter(type="orderer", organization=org)
472474
if not qs.exists():
473-
raise ResourceNotFound
475+
raise ResourceNotFound("Orderer Does Not Exist")
474476
orderer_node = qs.first()
475477

476478
orderer_tls_dir = "{}/{}/crypto-config/ordererOrganizations/{}/orderers/{}/msp/tlscacerts" \
@@ -483,7 +485,7 @@ def commit(self, request):
483485

484486
qs = Node.objects.filter(type="peer", organization=org)
485487
if not qs.exists():
486-
raise ResourceNotFound
488+
raise ResourceNotFound("Peer Does Not Exist")
487489
peer_node = qs.first()
488490
envs = init_env_vars(peer_node, org)
489491

@@ -530,7 +532,7 @@ def query_committed(self, request):
530532
org = request.user.organization
531533
qs = Node.objects.filter(type="peer", organization=org)
532534
if not qs.exists():
533-
raise ResourceNotFound
535+
raise ResourceNotFound("Peer Does Not Exist")
534536
peer_node = qs.first()
535537
envs = init_env_vars(peer_node, org)
536538
peer_channel_cli = PeerChainCode(**envs)
@@ -539,6 +541,7 @@ def query_committed(self, request):
539541
if code != 0:
540542
return Response(err("query committed failed."), status=status.HTTP_400_BAD_REQUEST)
541543
except Exception as e:
544+
LOG.exception("Could Not Commit Query")
542545
return Response(
543546
err(e.args), status=status.HTTP_400_BAD_REQUEST
544547
)

‎src/api-engine/api/routes/channel/views.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ def retrieve(self, request, pk=None):
188188
return Response(ok(response.data), status=status.HTTP_200_OK)
189189

190190
except ObjectDoesNotExist:
191+
LOG.exception("channel not found")
191192
raise ResourceNotFound
192193

193194
@swagger_auto_schema(
@@ -217,7 +218,7 @@ def update(self, request, pk=None):
217218
try:
218219
config = data["config"]["channel_group"]["groups"][org_type]["groups"][msp_id]
219220
except KeyError:
220-
LOG.error("config file not found")
221+
LOG.exception("config file not found")
221222
raise ResourceNotFound
222223

223224
try:
@@ -226,7 +227,7 @@ def update(self, request, pk=None):
226227
LOG.info("load current config success")
227228
current_config = json.load(f)
228229
except FileNotFoundError:
229-
LOG.error("current config file not found")
230+
LOG.exception("current config file not found")
230231
raise ResourceNotFound
231232

232233
# Create a new org
@@ -314,6 +315,7 @@ def update(self, request, pk=None):
314315
LOG.info("new_org save success")
315316
return Response(ok(None), status=status.HTTP_202_ACCEPTED)
316317
except ObjectDoesNotExist:
318+
LOG.exception("channel not found")
317319
raise ResourceNotFound
318320

319321
@swagger_auto_schema(
@@ -361,6 +363,7 @@ def get_channel_org_config(self, request, pk=None):
361363
)
362364
return Response(data=data, status=status.HTTP_200_OK)
363365
except ObjectDoesNotExist:
366+
LOG.exception("channel org not found")
364367
raise ResourceNotFound
365368

366369
def validate_nodes(nodes):

‎src/api-engine/api/routes/file/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def list(self, request):
5555
per_page = serializer.validated_data.get("per_page")
5656

5757
if organization is not None and not request.user.is_operator:
58-
raise PermissionDenied
58+
raise PermissionDenied("Non-Operator Request Denied")
5959
query_filter = {}
6060
if name:
6161
query_filter.update({"name__icontains": name})

‎src/api-engine/api/routes/general/views.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ def _conversion_msp_tls(self, name):
121121
with open("{}tls.zip".format(dir_org), "rb") as f_tls:
122122
tls = base64.b64encode(f_tls.read())
123123
except Exception as e:
124+
LOG.exception("Conversion Failed")
124125
raise e
125126

126127
return msp, tls
@@ -169,7 +170,7 @@ def post(self, request, *args, **kwargs):
169170
status=200,
170171
)
171172
except TokenError:
172-
LOG.warn("invalid token error")
173+
LOG.exception("invalid token error")
173174
return Response(
174175
data=err(msg="invalid token"),
175176
status=401

‎src/api-engine/api/routes/network/views.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def _genesis2base64(self, network):
5353
block = base64.b64encode(f_block.read())
5454
return block
5555
except Exception as e:
56+
LOG.exception("Genesis to Base64 Failed")
5657
raise e
5758

5859
@swagger_auto_schema(
@@ -138,6 +139,7 @@ def _agent_params(self, pk):
138139
info["ports"] = ports
139140
return info
140141
except Exception as e:
142+
LOG.exception("Could Not Get Params")
141143
raise e
142144

143145
def _start_node(self, pk):
@@ -156,6 +158,7 @@ def _start_node(self, pk):
156158
else:
157159
raise ResourceNotFound(detail="Container Not Built")
158160
except Exception as e:
161+
LOG.exception("Node Not Started")
159162
raise e
160163

161164
@swagger_auto_schema(
@@ -199,6 +202,7 @@ def create(self, request):
199202
threading.Thread(target=self._start_node,
200203
args=(node.id,)).start()
201204
except Exception as e:
205+
LOG.exception("Network Not Created")
202206
raise e
203207

204208
response = NetworkIDSerializer(data=network.__dict__)
@@ -207,6 +211,7 @@ def create(self, request):
207211
ok(response.validated_data), status=status.HTTP_201_CREATED
208212
)
209213
except ResourceExists as e:
214+
LOG.exception("Network Exists")
210215
raise e
211216
except Exception as e:
212217
return Response(

0 commit comments

Comments
 (0)