Commit 880088e7 authored by vicotor's avatar vicotor

update demoworker

parent 2b9b3c2d
...@@ -26,22 +26,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error ...@@ -26,22 +26,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error
return omanager.NewNodeManagerServiceClient(client), nil return omanager.NewNodeManagerServiceClient(client), nil
} }
func main() { func withManager(idx int, endpoint string) {
flag.Parse()
seed, err := newManagerClient(*manager)
if err != nil {
log.Fatal("connect seed manager failed", "err", err)
}
nmlist, err := seed.ManagerList(context.Background(), new(omanager.ManagerListRequest))
if err != nil {
log.Fatal("get manager list failed", "err", err)
}
log.WithField("count", len(nmlist.Managers)).Info("got manager list")
if len(nmlist.Managers) == 0 {
log.Fatal("no manager found")
}
endpoint := nmlist.Managers[0].Endpoint
client, err := newManagerClient(endpoint) client, err := newManagerClient(endpoint)
if err != nil { if err != nil {
log.WithField("endpoint", endpoint).Fatal("connect manager failed", "err", err) log.WithField("endpoint", endpoint).Fatal("connect manager failed", "err", err)
...@@ -53,6 +38,7 @@ func main() { ...@@ -53,6 +38,7 @@ func main() {
return return
} }
minerPubkey := "0x04d4c8fdd1729112459ba4e4a3c66e1cf480dfc1b06e250880234dc0578cb765280114711dd73c86ddec0e264d5a49b49558827d67d0dcdac6207bdfb1264c7461" minerPubkey := "0x04d4c8fdd1729112459ba4e4a3c66e1cf480dfc1b06e250880234dc0578cb765280114711dd73c86ddec0e264d5a49b49558827d67d0dcdac6207bdfb1264c7461"
if idx == 0 {
reg := &omanager.WorkerMessage{ reg := &omanager.WorkerMessage{
Message: &omanager.WorkerMessage_RegisteMessage{ Message: &omanager.WorkerMessage_RegisteMessage{
...@@ -88,7 +74,7 @@ func main() { ...@@ -88,7 +74,7 @@ func main() {
}, },
} }
managerClient.Send(resource) managerClient.Send(resource)
}
for { for {
data, err := managerClient.Recv() data, err := managerClient.Recv()
if err != nil { if err != nil {
...@@ -185,6 +171,27 @@ func main() { ...@@ -185,6 +171,27 @@ func main() {
log.WithField("endpoint", endpoint).Info("got proof task result") log.WithField("endpoint", endpoint).Info("got proof task result")
} }
}
}
func main() {
flag.Parse()
seed, err := newManagerClient(*manager)
if err != nil {
log.Fatal("connect seed manager failed", "err", err)
}
nmlist, err := seed.ManagerList(context.Background(), new(omanager.ManagerListRequest))
if err != nil {
log.Fatal("get manager list failed", "err", err)
}
log.WithField("count", len(nmlist.Managers)).Info("got manager list")
if len(nmlist.Managers) == 0 {
log.Fatal("no manager found")
}
for i, nm := range nmlist.Managers {
endpoint := nm.Endpoint
go withManager(i, endpoint)
} }
var wait = make(chan struct{})
<-wait
} }
...@@ -11,7 +11,6 @@ import ( ...@@ -11,7 +11,6 @@ import (
"github.com/odysseus/service-registry/registry" "github.com/odysseus/service-registry/registry"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"os"
"sync" "sync"
"time" "time"
) )
...@@ -43,11 +42,6 @@ func (s *NMRegister) ServiceType() common.ServiceType { ...@@ -43,11 +42,6 @@ func (s *NMRegister) ServiceType() common.ServiceType {
return common.SERVICE_NODE_MANAGER return common.SERVICE_NODE_MANAGER
} }
func (s *NMRegister) Instance() string {
hname, _ := os.Hostname()
return fmt.Sprintf("%s:%s", s.conf.RemoteHost, hname)
}
func (s *NMRegister) Status() string { func (s *NMRegister) Status() string {
return "running" return "running"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment