Skip to content

Commit

Permalink
Merge pull request #530 from xichen1/fix_dep_err
Browse files Browse the repository at this point in the history
Fix make command error

Close #528
  • Loading branch information
yeasy authored Jul 1, 2023
2 parents efc6e3b + da7ac48 commit ee03758
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion src/api-engine/api/lib/agent/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,5 @@ def get(self):
try:
return self._agent.get()
except Exception as e:
return False
LOG.error(e)
return False
4 changes: 2 additions & 2 deletions src/api-engine/api/routes/node/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,11 @@ def destroy(self, request, pk=None):
LOG.info("Retry to stop/delete container %d time(s).", i + 1)
try:
response = agent.stop()
if response != True:
if response is not True:
LOG.error("Failed when agent stops/deletes container: %s", response)
continue
response = agent.delete()
if response != True:
if response is not True:
LOG.error("Failed when agent stops/deletes container: %s", response)
continue
res = True
Expand Down
5 changes: 4 additions & 1 deletion src/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,8 @@
"src/**/*.less",
"config/**/*.js*",
"scripts/**/*.js"
]
],
"resolutions": {
"mockjs/commander": "^8.2.0"
}
}

0 comments on commit ee03758

Please sign in to comment.