dtapps
/
go-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases 40 Wiki Activity

- update jobs

Browse Source
master
李光春 2 years ago
parent ba95471844
commit 10b9c72ee2
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File

8
go.sum
Unescape View File

@ -39,13 +39,9 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ
github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
github.com/aws/aws-sdk-go v1.44.53 h1:2MErE8gRyBLuE1fuH2Sqlj1xoN3S6/jXb0aO/A1jGfk=
github.com/aws/aws-sdk-go v1.44.53/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go v1.44.54 h1:zfFptZ0iLuk+psnRLk+o0NMgd/pBsALlNE7i40iOmFA=
github.com/aws/aws-sdk-go v1.44.54/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/baidubce/bce-sdk-go v0.9.128 h1:SacX3qlQqS0hS4a5HWucQqOObGSLBmK/5W3PJwTi9/8=
github.com/baidubce/bce-sdk-go v0.9.128/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
github.com/baidubce/bce-sdk-go v0.9.129 h1:Q11ZtNGNOLqnJXpkl5l8+pnuflsOejJs7hJ09zFqiYg=
github.com/baidubce/bce-sdk-go v0.9.129/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg=
github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
@ -369,8 +365,6 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
github.com/klauspost/compress v1.15.7 h1:7cgTQxJCU/vy+oP/E3B9RGbQTgbiVzIJWIKOLoAsPok=
github.com/klauspost/compress v1.15.7/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
github.com/klauspost/compress v1.15.8 h1:JahtItbkWjf2jzm/T+qgMxkP9EMHsqEUA6vCMGmXvhA=
github.com/klauspost/compress v1.15.8/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@ -843,8 +837,6 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d h1:YbuF5+kdiC516xIP60RvlHeFbY9sRDR73QsAGHpkeVw=
google.golang.org/genproto v0.0.0-20220712132514-bdd2acd4974d/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220713161829-9c7dac0a6568 h1:iKx0VcikTdB4xj9Ho1Opn9AKzWFknYDE7oW/KBWZf9g=
google.golang.org/genproto v0.0.0-20220713161829-9c7dac0a6568/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=

1
utils/gojobs/etcd.go
Unescape View File

@ -13,6 +13,7 @@ type EtcdConfig struct {
Username string // 用户名
Password string // 密码
CustomDirectory string // 自定义目录，后面不需要/
Debug bool // 是否打印
}
// Etcd etcd

2
utils/gojobs/etcd_server.go
Unescape View File

@ -23,6 +23,8 @@ func NewEtcdServer(config *EtcdConfig) (*Etcd, error) {
e.Password = config.Password
e.CustomDirectory = config.CustomDirectory
e.Debug = config.Debug
v3Config := clientv3.Config{
Endpoints: e.Endpoints,
DialTimeout: e.DialTimeout,

30
utils/gojobs/etcd_worker.go
Unescape View File

@ -27,6 +27,8 @@ func NewEtcdWorker(config *EtcdConfig) (*Etcd, error) {
e.Password = config.Password
e.CustomDirectory = config.CustomDirectory
e.Debug = config.Debug
v3Config := clientv3.Config{
Endpoints: e.Endpoints,
DialTimeout: e.DialTimeout,
@ -70,21 +72,27 @@ func (e Etcd) RegisterWorker() {
for {
// 注册路径
regKey = getJobWorkerDir(e) + e.LocalIP
log.Println("租约：", regKey)
if e.Debug == true {
log.Println("租约：", regKey)
}
cancelFunc = nil
// 申请一个10秒的租约
leaseGrantResp, err = e.Lease.Grant(context.TODO(), 10)
if err != nil {
log.Println("申请一个10秒的租约失败", err)
if e.Debug == true {
log.Println("申请一个10秒的租约失败", err)
}
goto RETRY
}
// 自动永久续租
keepAliveChan, err = e.Lease.KeepAlive(context.TODO(), leaseGrantResp.ID)
if err != nil {
log.Println("自动永久续租失败", err)
if e.Debug == true {
log.Println("自动永久续租失败", err)
}
goto RETRY
}
@ -93,7 +101,9 @@ func (e Etcd) RegisterWorker() {
// 注册到etcd
_, err = e.Kv.Put(cancelCtx, regKey, "", clientv3.WithLease(leaseGrantResp.ID))
if err != nil {
log.Println(fmt.Sprintf(" %s 服务注册失败:%s", regKey, err))
if e.Debug == true {
log.Println(fmt.Sprintf(" %s 服务注册失败:%s", regKey, err))
}
goto RETRY
}
@ -102,16 +112,22 @@ func (e Etcd) RegisterWorker() {
select {
case keepAliveResp = <-keepAliveChan:
if keepAliveResp == nil {
log.Println("续租失败")
if e.Debug == true {
log.Println("续租失败")
}
goto RETRY
} else {
log.Println("收到自动续租应答:", leaseGrantResp.ID)
if e.Debug == true {
log.Println("收到自动续租应答:", leaseGrantResp.ID)
}
}
}
}
RETRY:
log.Println("异常 RETRY ", regKey)
if e.Debug == true {
log.Println("异常 RETRY ", regKey)
}
time.Sleep(1 * time.Second)
if cancelFunc != nil {
cancelFunc()

Write Preview
Loading…
Cancel
Save