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
418b128c
Commit
418b128c
authored
Feb 02, 2024
by
duanjinfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update model resp result unmashal
parent
0a744f29
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
22 deletions
+11
-22
rootcmd.go
cmd/rootcmd.go
+2
-2
config.json
config.json
+1
-1
req_resp.go
models/req_resp.go
+3
-3
model_handler.go
nm/model_handler.go
+5
-16
No files found.
cmd/rootcmd.go
View file @
418b128c
...
@@ -18,11 +18,11 @@ import (
...
@@ -18,11 +18,11 @@ import (
var
(
var
(
rewardAddr
string
rewardAddr
string
isSetReward
bool
=
fals
e
isSetReward
bool
=
tru
e
)
)
func
init
()
{
func
init
()
{
RootCmd
.
PersistentFlags
()
.
StringVarP
(
&
rewardAddr
,
"reward"
,
"r"
,
""
,
"please enter a reward address"
)
RootCmd
.
PersistentFlags
()
.
StringVarP
(
&
rewardAddr
,
"reward"
,
"r"
,
"
0x84A3175be614F5886f99Da506dF08682DF530739
"
,
"please enter a reward address"
)
cobra
.
OnInitialize
(
initConfig
)
cobra
.
OnInitialize
(
initConfig
)
}
}
...
...
config.json
View file @
418b128c
{
{
"nm_seed"
:
"192.168.1.109:10001"
,
"nm_seed"
:
"192.168.1.109:10001"
,
"docker_server"
:
"tcp://127.0.0.1:2375"
,
"docker_server"
:
"tcp://127.0.0.1:2375"
,
"api_url"
:
"http://192.168.1.
109
:8087/api/task/taskheat"
,
"api_url"
:
"http://192.168.1.
8
:8087/api/task/taskheat"
,
"node_manager_num"
:
1
,
"node_manager_num"
:
1
,
"heart_response"
:
30
,
"heart_response"
:
30
,
"task_validator_time"
:
1
,
"task_validator_time"
:
1
,
...
...
models/req_resp.go
View file @
418b128c
...
@@ -14,7 +14,7 @@ type NodeManagerReq struct {
...
@@ -14,7 +14,7 @@ type NodeManagerReq struct {
}
}
type
Resp
struct
{
type
Resp
struct
{
Code
int
`json:"code"`
Code
int
`json:"code"`
Msg
string
`json:"msg"`
Msg
string
`json:"msg"`
Data
string
`json:"data"`
Data
[]
*
ModelInfo
`json:"data"`
}
}
nm/model_handler.go
View file @
418b128c
package
nm
package
nm
import
(
import
(
"bytes"
"encoding/json"
"encoding/json"
"example.com/m/conf"
"example.com/m/conf"
"example.com/m/log"
"example.com/m/log"
...
@@ -20,7 +19,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
...
@@ -20,7 +19,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
for
{
for
{
select
{
select
{
case
<-
ticker
.
C
:
case
<-
ticker
.
C
:
modelInfosResp
:=
make
([]
*
models
.
ModelInfo
,
0
)
modelResp
,
err
:=
client
.
Get
(
conf
.
GetConfig
()
.
ApiUrl
)
modelResp
,
err
:=
client
.
Get
(
conf
.
GetConfig
()
.
ApiUrl
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"Error getting model info from client failed:"
,
err
)
log
.
Error
(
"Error getting model info from client failed:"
,
err
)
...
@@ -32,29 +30,20 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
...
@@ -32,29 +30,20 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
continue
continue
}
}
resp
:=
&
models
.
Resp
{}
resp
:=
&
models
.
Resp
{}
if
resp
.
Code
!=
http
.
StatusOK
{
log
.
Error
(
"Response code :"
,
resp
.
Code
)
continue
}
if
resp
.
Data
==
""
{
log
.
Warn
(
"Response data is empty"
)
continue
}
err
=
json
.
Unmarshal
(
bodyBytes
,
resp
)
err
=
json
.
Unmarshal
(
bodyBytes
,
resp
)
if
err
!=
nil
{
if
err
!=
nil
{
log
.
Error
(
"Unmarshal model response failed:"
,
err
)
log
.
Error
(
"Unmarshal model response failed:"
,
err
)
continue
continue
}
}
dataResp
,
err
:=
io
.
ReadAll
(
bytes
.
NewBufferString
(
resp
.
Data
))
if
resp
.
Code
!=
http
.
StatusOK
{
if
err
!=
nil
{
log
.
Error
(
"Response code :"
,
resp
.
Code
)
log
.
Error
(
"Error reading model response data failed:"
,
err
)
continue
continue
}
}
err
=
json
.
Unmarshal
(
dataResp
,
&
modelInfosResp
)
if
resp
.
Data
==
nil
||
len
(
resp
.
Data
)
==
0
{
if
err
!=
nil
{
log
.
Warn
(
"Response data is empty"
)
log
.
Error
(
"Unmarshal model response failed:"
,
err
)
continue
continue
}
}
modelInfosResp
:=
resp
.
Data
modelInfoMap
:=
make
(
map
[
uint64
]
*
models
.
ModelInfo
,
0
)
modelInfoMap
:=
make
(
map
[
uint64
]
*
models
.
ModelInfo
,
0
)
for
_
,
modelInfo
:=
range
modelInfosResp
{
for
_
,
modelInfo
:=
range
modelInfosResp
{
modelInfoMap
[
modelInfo
.
TaskId
]
=
modelInfo
modelInfoMap
[
modelInfo
.
TaskId
]
=
modelInfo
...
...
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