Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
power-node
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Odysseus
power-node
Commits
6be8291f
Commit
6be8291f
authored
Mar 20, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update return frontend exec error msg
parent
c76f6bee
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
start.go
nm/start.go
+1
-1
task_msg.go
nm/task_msg.go
+10
-10
No files found.
nm/start.go
View file @
6be8291f
...
...
@@ -304,7 +304,7 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
if
containerSign
==
nil
||
len
(
containerSign
)
==
0
{
log
.
Error
(
"Container signing failed................"
)
isSuccess
=
false
taskExecRes
.
TaskExecError
=
fmt
.
Sprintf
(
"%s
,%s"
,
taskExecRes
.
TaskExecError
,
"Container sign failed"
)
taskExecRes
.
TaskExecError
=
fmt
.
Sprintf
(
"%s
"
,
"Container sign failed"
)
}
reqHash
,
respHash
,
minerSign
:=
taskMsgWorker
.
GetMinerSign
(
taskMsg
,
taskExecRes
.
TaskRespBody
)
params
:=
buildParams
(
taskMsg
.
TaskId
,
containerSign
,
minerSign
,
taskExecRes
,
isSuccess
)
...
...
nm/task_msg.go
View file @
6be8291f
...
...
@@ -183,7 +183,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
containerId
,
err
:=
t
.
DockerOp
.
CreateAndStartContainer
(
taskCmd
.
ImageName
,
taskCmd
.
DockerCmd
)
if
err
!=
nil
{
log
.
Errorf
(
"Create and start container failed: %s"
,
err
.
Error
())
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Create and start container failed
: %s
"
,
err
.
Error
())
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Create and start container failed"
,
err
.
Error
())
return
}
log
.
Infof
(
"Started container with ID %s"
,
containerId
)
...
...
@@ -213,6 +213,11 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
taskCmd
.
ApiUrl
=
fmt
.
Sprintf
(
"%s?%s"
,
taskCmd
.
ApiUrl
,
queryString
)
}
request
,
err
:=
http
.
NewRequest
(
"POST"
,
taskCmd
.
ApiUrl
,
reqContainerBody
)
if
err
!=
nil
{
log
.
WithField
(
"error:"
,
err
)
.
Error
(
"New container request failed"
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Http client new container request failed"
,
err
.
Error
())
return
}
request
.
Header
.
Set
(
"Content-Type"
,
"application/json"
)
for
key
,
value
:=
range
taskParam
.
Headers
{
if
key
==
models
.
Prefer
{
...
...
@@ -233,7 +238,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
_
,
err
:=
url
.
Parse
(
m
.
WebHook
)
if
err
!=
nil
{
log
.
WithError
(
err
)
.
Error
(
"web hook url parse failed"
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"
w
eb hook url parse failed"
,
err
.
Error
())
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"
W
eb hook url parse failed"
,
err
.
Error
())
return
}
}
...
...
@@ -241,11 +246,6 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
}
}
if
err
!=
nil
{
log
.
WithField
(
"error:"
,
err
)
.
Error
(
"New container request failed"
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Http client post request container failed"
,
err
.
Error
())
return
}
post
,
err
:=
t
.
HttpClient
.
Do
(
request
)
if
err
!=
nil
{
log
.
WithField
(
"error:"
,
err
)
.
Error
(
"Http client post request container failed"
)
...
...
@@ -292,7 +292,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
ossUri
,
err
:=
t
.
getFileCache
(
respStr
,
taskMsg
,
taskParam
,
taskCmd
)
if
err
!=
nil
||
ossUri
==
""
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
taskExecResult
.
TaskExecError
,
err
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Get file cache uri failed"
,
err
)
apiResOneArr
=
append
(
apiResOneArr
,
respStr
)
apiResBody
:=
utils
.
EncodeJsonEscapeHTML
(
apiRes
)
taskExecResult
.
TaskRespBody
=
apiResBody
...
...
@@ -327,7 +327,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
ossUri
,
err
:=
t
.
getFileCache
(
respStr
,
taskMsg
,
taskParam
,
taskCmd
)
if
err
!=
nil
||
ossUri
==
""
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
taskExecResult
.
TaskExecError
,
err
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Get file cache uri failed"
,
err
)
apiRes
=
append
(
apiRes
,
respStr
)
apiResBody
:=
utils
.
EncodeJsonEscapeHTML
(
apiRes
)
taskExecResult
.
TaskRespBody
=
apiResBody
...
...
@@ -361,7 +361,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
}
ossUri
,
err
:=
t
.
getFileCache
(
respStr
,
taskMsg
,
taskParam
,
taskCmd
)
if
err
!=
nil
||
ossUri
==
""
{
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
taskExecResult
.
TaskExecError
,
err
)
taskExecResult
.
TaskExecError
=
fmt
.
Sprintf
(
"%s,%s"
,
"Get file cache uri failed"
,
err
)
apiRes
=
append
(
apiRes
,
respStr
)
apiResBody
:=
utils
.
EncodeJsonEscapeHTML
(
apiRes
)
taskExecResult
.
TaskRespBody
=
apiResBody
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment