From 95074b2a86ce6b3e3b4801757ecdd8f326a9256b Mon Sep 17 00:00:00 2001 From: Varakh Date: Thu, 16 May 2024 07:33:32 +0000 Subject: [PATCH] chore(deps): update dependencies and move to gocron v2 (#33) Reviewed-on: https://git.myservermanager.com/varakh/upda/pulls/33 Co-authored-by: Varakh Co-committed-by: Varakh --- CHANGELOG.md | 2 +- go.mod | 27 +-- go.sum | 82 ++++----- server/environment.go | 58 +++--- server/service_task.go | 398 ++++++++++++++++------------------------- 5 files changed, 235 insertions(+), 332 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b0dbf9..eb95f4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ Changes adhere to [semantic versioning](https://semver.org). ## [2.0.2] - UNRELEASED -* ... +* Updated dependencies ## [2.0.1] - 2024/05/01 diff --git a/go.mod b/go.mod index 3fd7726..1fffc68 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/adrg/xdg v0.4.0 github.com/containrrr/shoutrrr v0.8.0 github.com/gin-contrib/cors v1.7.2 - github.com/gin-contrib/zap v1.1.1 - github.com/gin-gonic/gin v1.9.1 - github.com/go-co-op/gocron v1.37.0 - github.com/go-co-op/gocron-redis-lock v1.3.0 + github.com/gin-contrib/zap v1.1.3 + github.com/gin-gonic/gin v1.10.0 + github.com/go-co-op/gocron-redis-lock/v2 v2.0.1 + github.com/go-co-op/gocron/v2 v2.5.0 github.com/go-playground/validator/v10 v10.20.0 - github.com/go-resty/resty/v2 v2.12.0 + github.com/go-resty/resty/v2 v2.13.1 github.com/google/uuid v1.6.0 github.com/redis/go-redis/v9 v9.5.1 github.com/stretchr/testify v1.9.0 @@ -48,6 +48,7 @@ require ( github.com/jackc/pgx/v5 v5.4.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/leodido/go-urn v1.4.0 // indirect @@ -57,7 +58,7 @@ require ( github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.2.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect @@ -68,13 +69,13 @@ require ( github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect - go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.22.0 // indirect - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.34.0 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/crypto v0.23.0 // indirect + golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sys v0.20.0 // indirect + golang.org/x/text v0.15.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index e68217e..d09a4ae 100644 --- a/go.sum +++ b/go.sum @@ -41,7 +41,6 @@ github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoY github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -63,14 +62,14 @@ github.com/gin-contrib/cors v1.7.2 h1:oLDHxdg8W/XDoN/8zamqk/Drgt4oVZDvaV0YmvVICQ github.com/gin-contrib/cors v1.7.2/go.mod h1:SUJVARKgQ40dmrzgXEVxj2m7Ig1v1qIboQkPDTQ9t2E= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-contrib/zap v1.1.1 h1:DDyIF9YQorl3gZzAabIowRywHJuohDfiLnhwvWKl6SY= -github.com/gin-contrib/zap v1.1.1/go.mod h1:YW8KOko2kYLy8g6k9YgVNTj7SIcrUEzYiAd9IjiBPs0= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= -github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0= -github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY= -github.com/go-co-op/gocron-redis-lock v1.3.0 h1:PKwtuc/BhrDll/DxJfnXoW/+D1VXubd47xcGaB9pDuM= -github.com/go-co-op/gocron-redis-lock v1.3.0/go.mod h1:9+H7ZfqVtJfx94uEAELwH+uHkn1UpM6lRM99wOBTGtg= +github.com/gin-contrib/zap v1.1.3 h1:9e/U9fYd4/OBfmSEBs5hHZq114uACn7bpuzvCkcJySA= +github.com/gin-contrib/zap v1.1.3/go.mod h1:+BD/6NYZKJyUpqVoJEvgeq9GLz8pINEQvak9LHNOTSE= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-co-op/gocron-redis-lock/v2 v2.0.1 h1:xM+mzO88L+kODvY4vIUVLlZuyWazK5vJfK0DiFachdQ= +github.com/go-co-op/gocron-redis-lock/v2 v2.0.1/go.mod h1:FSHZ13f4bfH37RpJi9l3vl2GTiJRUI6xTDbUvXLoqrY= +github.com/go-co-op/gocron/v2 v2.5.0 h1:ff/TJX9GdTJBDL1il9cyd/Sj3WnS+BB7ZzwHKSNL5p8= +github.com/go-co-op/gocron/v2 v2.5.0/go.mod h1:ckPQw96ZuZLRUGu88vVpd9a6d9HakI14KWahFZtGvNw= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -91,8 +90,8 @@ github.com/go-redis/redis/v8 v8.11.4 h1:kHoYkfZP6+pe04aFTnhDH6GDROa5yJdHJVNxV3F4 github.com/go-redis/redis/v8 v8.11.4/go.mod h1:2Z2wHZXdQpCDXEGzqMockDpNyYvi2l4Pxt6RJr792+w= github.com/go-redsync/redsync/v4 v4.11.0 h1:OPEcAxHBb95EzfwCKWM93ksOwHd5bTce2BD4+R14N6k= github.com/go-redsync/redsync/v4 v4.11.0/go.mod h1:ZfayzutkgeBmEmBlUR3j+rF6kN44UUGtEdfzhBFZTPc= -github.com/go-resty/resty/v2 v2.12.0 h1:rsVL8P90LFvkUYq/V5BTVe203WfRIU4gvcf+yfzJzGA= -github.com/go-resty/resty/v2 v2.12.0/go.mod h1:o0yGPrkS3lOe1+eFajk6kBW8ScXzwU3hD69/gt2yB/0= +github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g= +github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= @@ -108,7 +107,6 @@ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -129,6 +127,8 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= @@ -138,8 +138,6 @@ github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuV github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -184,9 +182,8 @@ github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/ github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= -github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg= -github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -208,8 +205,6 @@ github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo= github.com/redis/rueidis v1.0.19/go.mod h1:8B+r5wdnjwK3lTFml5VtxjzGOQAC+5UmujoD12pDrEo= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -229,7 +224,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -256,9 +250,6 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= @@ -270,23 +261,22 @@ go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= -golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f h1:99ci1mjWVBWwJiEKYY6jWa4d2nTQVIEhZIptnrVb1XY= +golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -296,15 +286,14 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -319,22 +308,22 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -343,8 +332,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -352,13 +341,12 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg= google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4= -google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/server/environment.go b/server/environment.go index db15894..3579fdf 100644 --- a/server/environment.go +++ b/server/environment.go @@ -47,22 +47,22 @@ type authConfig struct { type taskConfig struct { updateCleanStaleEnabled bool - updateCleanStaleInterval string + updateCleanStaleInterval time.Duration updateCleanStaleMaxAge time.Duration eventCleanStaleEnabled bool - eventCleanStaleInterval string + eventCleanStaleInterval time.Duration eventCleanStaleMaxAge time.Duration actionsEnqueueEnabled bool - actionsEnqueueInterval string + actionsEnqueueInterval time.Duration actionsEnqueueBatchSize int actionsInvokeEnabled bool - actionsInvokeInterval string + actionsInvokeInterval time.Duration actionsInvokeBatchSize int actionsInvokeMaxRetries int actionsCleanStaleEnabled bool - actionsCleanStaleInterval string + actionsCleanStaleInterval time.Duration actionsCleanStaleMaxAge time.Duration - prometheusRefreshInterval string + prometheusRefreshInterval time.Duration } type lockConfig struct { @@ -236,15 +236,15 @@ func bootstrapEnvironment() *Environment { // task config var tc *taskConfig - var updateCleanStaleMaxAge time.Duration - if updateCleanStaleMaxAge, errParse = time.ParseDuration(os.Getenv(envTaskUpdateCleanStaleMaxAge)); errParse != nil { - zap.L().Sugar().Fatalf("Could not parse max age for cleaning stale updates. Reason: %s", errParse.Error()) - } - - var eventCleanStaleMaxAge time.Duration - if eventCleanStaleMaxAge, errParse = time.ParseDuration(os.Getenv(envTaskEventCleanStaleMaxAge)); errParse != nil { - zap.L().Sugar().Fatalf("Could not parse max age for cleaning stale events. Reason: %s", errParse.Error()) - } + updateCleanStaleInterval := parseDuration(envTaskUpdateCleanStaleInterval) + updateCleanStaleMaxAge := parseDuration(envTaskUpdateCleanStaleMaxAge) + eventCleanStaleMaxAge := parseDuration(envTaskEventCleanStaleMaxAge) + actionsCleanStaleMaxAge := parseDuration(envTaskActionsCleanStaleMaxAge) + eventCleanStaleInterval := parseDuration(envTaskEventCleanStaleInterval) + actionsEnqueueInterval := parseDuration(envTaskActionsEnqueueInterval) + actionsInvokeInterval := parseDuration(envTaskActionsInvokeInterval) + actionsCleanStaleInterval := parseDuration(envTaskActionsCleanStaleInterval) + prometheusRefreshInterval := parseDuration(envTaskPrometheusRefreshInterval) var actionsEnqueueBatchSize int if actionsEnqueueBatchSize, err = strconv.Atoi(os.Getenv(envTaskActionsEnqueueBatchSize)); err != nil { @@ -270,29 +270,24 @@ func bootstrapEnvironment() *Environment { zap.L().Sugar().Fatalf("Invalid actions invoke max retries, must be a positive number.") } - var actionsCleanStaleMaxAge time.Duration - if actionsCleanStaleMaxAge, errParse = time.ParseDuration(os.Getenv(envTaskActionsCleanStaleMaxAge)); errParse != nil { - zap.L().Sugar().Fatalf("Could not parse max age for cleaning stale actions. Reason: %s", errParse.Error()) - } - tc = &taskConfig{ updateCleanStaleEnabled: os.Getenv(envTaskUpdateCleanStaleEnabled) == "true", - updateCleanStaleInterval: os.Getenv(envTaskUpdateCleanStaleInterval), + updateCleanStaleInterval: updateCleanStaleInterval, updateCleanStaleMaxAge: updateCleanStaleMaxAge, eventCleanStaleEnabled: os.Getenv(envTaskEventCleanStaleEnabled) == "true", - eventCleanStaleInterval: os.Getenv(envTaskEventCleanStaleInterval), + eventCleanStaleInterval: eventCleanStaleInterval, eventCleanStaleMaxAge: eventCleanStaleMaxAge, actionsEnqueueEnabled: os.Getenv(envTaskActionsEnqueueEnabled) == "true", - actionsEnqueueInterval: os.Getenv(envTaskActionsEnqueueInterval), + actionsEnqueueInterval: actionsEnqueueInterval, actionsEnqueueBatchSize: actionsEnqueueBatchSize, actionsInvokeEnabled: os.Getenv(envTaskActionsInvokeEnabled) == "true", - actionsInvokeInterval: os.Getenv(envTaskActionsInvokeInterval), + actionsInvokeInterval: actionsInvokeInterval, actionsInvokeBatchSize: actionsInvokeBatchSize, actionsInvokeMaxRetries: actionsInvokeMaxRetries, actionsCleanStaleEnabled: os.Getenv(envTaskActionsCleanStaleEnabled) == "true", - actionsCleanStaleInterval: os.Getenv(envTaskActionsCleanStaleInterval), + actionsCleanStaleInterval: actionsCleanStaleInterval, actionsCleanStaleMaxAge: actionsCleanStaleMaxAge, - prometheusRefreshInterval: os.Getenv(envTaskPrometheusRefreshInterval), + prometheusRefreshInterval: prometheusRefreshInterval, } var lc *lockConfig @@ -488,6 +483,17 @@ func setEnvKeyDefault(key string, defaultValue string) { } } +func parseDuration(envProperty string) time.Duration { + var duration time.Duration + var err error + + if duration, err = time.ParseDuration(os.Getenv(envProperty)); err != nil { + zap.L().Sugar().Fatalf("Could not parse duration for '%s'. Reason: %s", envProperty, err.Error()) + } + + return duration +} + func parseBasicAuthCredentials(envProperty string) map[string]string { if envProperty == "" { zap.L().Sugar().Fatalln("Invalid env for parsing basic auth credentials") diff --git a/server/service_task.go b/server/service_task.go index e225cf2..f8d03cd 100644 --- a/server/service_task.go +++ b/server/service_task.go @@ -2,8 +2,9 @@ package server import ( "git.myservermanager.com/varakh/upda/api" - "github.com/go-co-op/gocron" - redislock "github.com/go-co-op/gocron-redis-lock" + redislock "github.com/go-co-op/gocron-redis-lock/v2" + "github.com/go-co-op/gocron/v2" + "github.com/google/uuid" "github.com/redis/go-redis/v9" "go.uber.org/zap" "time" @@ -21,16 +22,16 @@ type taskService struct { taskConfig *taskConfig lockConfig *lockConfig prometheusConfig *prometheusConfig - scheduler *gocron.Scheduler + scheduler gocron.Scheduler } const ( - taskLockNameUpdatesCleanStale = "updates_clean_stale" - taskLockNameEventsCleanStale = "events_clean_stale" - taskLockNameActionsEnqueue = "actions_enqueue" - taskLockNameActionsInvoke = "actions_invoke" - taskLockNameActionsCleanStale = "actions_clean_stale" - taskLockNamePrometheusUpdate = "prometheus_update" + JobUpdatesCleanStale = "UPDATES_CLEAN_STALE" + JobEventsCleanStale = "EVENTS_CLEAN_STALE" + JobActionsEnqueue = "ACTIONS_ENQUEUE" + JobActionsInvoke = "ACTIONS_INVOKE" + JobActionsCleanStale = "ACTIONS_CLEAN_STALE" + JobPrometheusRefresh = "PROMETHEUS_REFRESH" ) var ( @@ -44,11 +45,19 @@ func newTaskService(u *updateService, e *eventService, w *webhookService, a *act zap.L().Sugar().Fatalf("Could not initialize correct timezone for scheduler. Reason: %s", err.Error()) } - gocron.SetPanicHandler(func(jobName string, value any) { - zap.L().Sugar().Errorf("Job '%s' had a panic %v", jobName, value) + // global job options + singletonModeOption := gocron.WithSingletonMode(gocron.LimitModeReschedule) + errorEventListener := gocron.AfterJobRunsWithError(func(jobID uuid.UUID, jobName string, err error) { + zap.L().Sugar().Errorf("Job '%s' (%v) had a panic %v", jobName, jobID, err) }) + successEventListener := gocron.AfterJobRuns(func(jobID uuid.UUID, jobName string) { + zap.L().Sugar().Debugf("Job '%s' (%v) finished", jobName, jobID) + }) + eventListenerOption := gocron.WithEventListeners(successEventListener, errorEventListener) + startAtOption := gocron.WithStartAt(gocron.WithStartDateTime(initialTasksStartDelay)) - scheduler := gocron.NewScheduler(location) + // global scheduler options + schedulerOptions := []gocron.SchedulerOption{gocron.WithLocation(location), gocron.WithGlobalJobOptions(singletonModeOption, eventListenerOption, startAtOption)} if lc.redisEnabled { var redisOptions *redis.Options @@ -58,13 +67,17 @@ func newTaskService(u *updateService, e *eventService, w *webhookService, a *act zap.L().Sugar().Fatalf("Cannot parse REDIS URL '%s' to set up locking. Reason: %s", lc.redisUrl, err.Error()) } redisClient := redis.NewClient(redisOptions) - locker, err := redislock.NewRedisLocker(redisClient, redislock.WithTries(1)) - if err != nil { + + var locker gocron.Locker + if locker, err = redislock.NewRedisLocker(redisClient, redislock.WithTries(1)); err != nil { zap.L().Sugar().Fatalf("Cannot set up REDIS locker. Reason: %s", err.Error()) } - scheduler.WithDistributedLocker(locker) + + schedulerOptions = append(schedulerOptions, gocron.WithDistributedLocker(locker)) } + scheduler, _ := gocron.NewScheduler(schedulerOptions...) + return &taskService{ updateService: u, eventService: e, @@ -92,13 +105,18 @@ func (s *taskService) init() { func (s *taskService) stop() { zap.L().Sugar().Infof("Stopping %d periodic tasks...", len(s.scheduler.Jobs())) - s.scheduler.Stop() + if err := s.scheduler.StopJobs(); err != nil { + zap.L().Sugar().Warnf("Cannot stop periodic tasks. Reason: %v", err) + } + if err := s.scheduler.Shutdown(); err != nil { + zap.L().Sugar().Warnf("Cannot shut down scheduler. Reason: %v", err) + } s.lockService.stop() zap.L().Info("Stopped all periodic tasks") } func (s *taskService) start() { - s.scheduler.StartAsync() + s.scheduler.Start() zap.L().Sugar().Infof("Started %d periodic tasks", len(s.scheduler.Jobs())) } @@ -106,45 +124,28 @@ func (s *taskService) configureCleanupStaleUpdatesTask() { if !s.taskConfig.updateCleanStaleEnabled { return } - _, err := s.scheduler.Every(s.taskConfig.updateCleanStaleInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNameUpdatesCleanStale - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } - t := time.Now() - t = t.Add(-s.taskConfig.updateCleanStaleMaxAge) + runnable := func() { + t := time.Now() + t = t.Add(-s.taskConfig.updateCleanStaleMaxAge) - var err error - var c int64 + var err error + var c int64 - if c, err = s.updateService.cleanStale(t, api.UpdateStateApproved, api.UpdateStateIgnored); err != nil { - zap.L().Sugar().Errorf("Could not clean up ignored or approved updates older than %s (%s). Reason: %s", s.taskConfig.updateCleanStaleMaxAge, t, err.Error()) - return - } + if c, err = s.updateService.cleanStale(t, api.UpdateStateApproved, api.UpdateStateIgnored); err != nil { + zap.L().Sugar().Errorf("Could not clean up ignored or approved updates older than %s (%s). Reason: %s", s.taskConfig.updateCleanStaleMaxAge, t, err.Error()) + return + } - if c > 0 { - zap.L().Sugar().Infof("Cleaned up '%d' stale updates", c) - } else { - zap.L().Debug("No stale updates found to clean up") - } - }) + if c > 0 { + zap.L().Sugar().Infof("Cleaned up '%d' stale updates", c) + } else { + zap.L().Debug("No stale updates found to clean up") + } + } - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.updateCleanStaleInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobUpdatesCleanStale)); err != nil { zap.L().Sugar().Fatalf("Could not create task for cleaning stale updates. Reason: %s", err.Error()) } } @@ -154,45 +155,27 @@ func (s *taskService) configureCleanupStaleEventsTask() { return } - _, err := s.scheduler.Every(s.taskConfig.eventCleanStaleInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNameEventsCleanStale - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } + runnable := func() { + t := time.Now() + t = t.Add(-s.taskConfig.eventCleanStaleMaxAge) - t := time.Now() - t = t.Add(-s.taskConfig.eventCleanStaleMaxAge) + var err error + var c int64 - var err error - var c int64 + if c, err = s.eventService.cleanStale(t, api.EventStateCreated, api.EventStateEnqueued); err != nil { + zap.L().Sugar().Errorf("Could not clean up stale events older than %s (%s). Reason: %s", s.taskConfig.eventCleanStaleMaxAge, t, err.Error()) + return + } - if c, err = s.eventService.cleanStale(t, api.EventStateCreated, api.EventStateEnqueued); err != nil { - zap.L().Sugar().Errorf("Could not clean up stale events older than %s (%s). Reason: %s", s.taskConfig.eventCleanStaleMaxAge, t, err.Error()) - return - } + if c > 0 { + zap.L().Sugar().Infof("Cleaned up '%d' stale events", c) + } else { + zap.L().Debug("No stale events found to clean up") + } + } - if c > 0 { - zap.L().Sugar().Infof("Cleaned up '%d' stale events", c) - } else { - zap.L().Debug("No stale events found to clean up") - } - }) - - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.eventCleanStaleInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobEventsCleanStale)); err != nil { zap.L().Sugar().Fatalf("Could not create task for cleaning stale events. Reason: %s", err.Error()) } } @@ -202,32 +185,14 @@ func (s *taskService) configureActionsEnqueueTask() { return } - _, err := s.scheduler.Every(s.taskConfig.actionsEnqueueInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNameActionsEnqueue - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } + runnable := func() { + if err := s.actionInvocationService.enqueue(s.taskConfig.actionsEnqueueBatchSize); err != nil { + zap.L().Sugar().Errorf("Could enqueue actions. Reason: %s", err.Error()) + } + } - if err := s.actionInvocationService.enqueue(s.taskConfig.actionsEnqueueBatchSize); err != nil { - zap.L().Sugar().Errorf("Could enqueue actions. Reason: %s", err.Error()) - } - }) - - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.actionsEnqueueInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobActionsEnqueue)); err != nil { zap.L().Sugar().Fatalf("Could not create task for enqueueing actions. Reason: %s", err.Error()) } } @@ -237,32 +202,14 @@ func (s *taskService) configureActionsInvokeTask() { return } - _, err := s.scheduler.Every(s.taskConfig.actionsInvokeInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNameActionsInvoke - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } + runnable := func() { + if err := s.actionInvocationService.invoke(s.taskConfig.actionsInvokeBatchSize, s.taskConfig.actionsInvokeMaxRetries); err != nil { + zap.L().Sugar().Errorf("Could invoke actions. Reason: %s", err.Error()) + } + } - if err := s.actionInvocationService.invoke(s.taskConfig.actionsInvokeBatchSize, s.taskConfig.actionsInvokeMaxRetries); err != nil { - zap.L().Sugar().Errorf("Could invoke actions. Reason: %s", err.Error()) - } - }) - - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.actionsInvokeInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobActionsInvoke)); err != nil { zap.L().Sugar().Fatalf("Could not create task for invoking actions. Reason: %s", err.Error()) } } @@ -271,52 +218,35 @@ func (s *taskService) configureCleanupStaleActionsTask() { if !s.taskConfig.actionsCleanStaleEnabled { return } - _, err := s.scheduler.Every(s.taskConfig.actionsCleanStaleInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNameActionsCleanStale - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } - t := time.Now() - t = t.Add(-s.taskConfig.actionsCleanStaleMaxAge) + runnable := func() { + t := time.Now() + t = t.Add(-s.taskConfig.actionsCleanStaleMaxAge) - var cError int64 - var err error + var cError int64 + var err error - if cError, err = s.actionInvocationService.cleanStale(t, s.taskConfig.actionsInvokeMaxRetries, api.ActionInvocationStateError); err != nil { - zap.L().Sugar().Errorf("Could not clean up error stale actions older than %s (%s). Reason: %s", s.taskConfig.actionsCleanStaleMaxAge, t, err.Error()) - return - } + if cError, err = s.actionInvocationService.cleanStale(t, s.taskConfig.actionsInvokeMaxRetries, api.ActionInvocationStateError); err != nil { + zap.L().Sugar().Errorf("Could not clean up error stale actions older than %s (%s). Reason: %s", s.taskConfig.actionsCleanStaleMaxAge, t, err.Error()) + return + } - var cSuccess int64 - if cSuccess, err = s.actionInvocationService.cleanStale(t, 0, api.ActionInvocationStateSuccess); err != nil { - zap.L().Sugar().Errorf("Could not clean up success stale actions older than %s (%s). Reason: %s", s.taskConfig.actionsCleanStaleMaxAge, t, err.Error()) - return - } + var cSuccess int64 + if cSuccess, err = s.actionInvocationService.cleanStale(t, 0, api.ActionInvocationStateSuccess); err != nil { + zap.L().Sugar().Errorf("Could not clean up success stale actions older than %s (%s). Reason: %s", s.taskConfig.actionsCleanStaleMaxAge, t, err.Error()) + return + } - c := cError + cSuccess - if c > 0 { - zap.L().Sugar().Infof("Cleaned up '%d' stale actions", c) - } else { - zap.L().Debug("No stale actions found to clean up") - } - }) + c := cError + cSuccess + if c > 0 { + zap.L().Sugar().Infof("Cleaned up '%d' stale actions", c) + } else { + zap.L().Debug("No stale actions found to clean up") + } + } - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.actionsCleanStaleInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobActionsCleanStale)); err != nil { zap.L().Sugar().Fatalf("Could not create task for cleaning stale actions. Reason: %s", err.Error()) } } @@ -326,83 +256,61 @@ func (s *taskService) configurePrometheusRefreshTask() { return } - _, err := s.scheduler.Every(s.taskConfig.prometheusRefreshInterval). - StartAt(initialTasksStartDelay). - Do(func() { - resource := taskLockNamePrometheusUpdate - // distributed lock handled via gocron-redis-lock for tasks - if !s.lockConfig.redisEnabled { - // skip execution if lock already exists, wait otherwise - if lockExists := s.lockService.exists(resource); lockExists { - zap.L().Sugar().Debugf("Skipping task execution because task lock '%s' exists", resource) - return - } - _ = s.lockService.tryLock(resource) - defer func(lockService lockService, resource string) { - err := lockService.release(resource) - if err != nil { - zap.L().Sugar().Warnf("Could not release task lock '%s'", resource) - } - }(s.lockService, resource) - } + runnable := func() { + updates, updatesError := s.updateService.getAll() - // updates with labels and collect stats about state - updates, updatesError := s.updateService.getAll() + if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesTotal, float64(len(updates))); updatesError != nil { + zap.L().Sugar().Errorf("Could not refresh updates all prometheus metric. Reason: %s", updatesError.Error()) + } - if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesTotal, float64(len(updates))); updatesError != nil { - zap.L().Sugar().Errorf("Could not refresh updates all prometheus metric. Reason: %s", updatesError.Error()) - } + var pendingTotal int64 + var ignoredTotal int64 + var ackTotal int64 - var pendingTotal int64 - var ignoredTotal int64 - var ackTotal int64 + for _, update := range updates { + if api.UpdateStatePending.Value() == update.State { + pendingTotal += 1 + } else if api.UpdateStateIgnored.Value() == update.State { + ignoredTotal += 1 + } else if api.UpdateStateApproved.Value() == update.State { + ackTotal += 1 + } + } - for _, update := range updates { - if api.UpdateStatePending.Value() == update.State { - pendingTotal += 1 - } else if api.UpdateStateIgnored.Value() == update.State { - ignoredTotal += 1 - } else if api.UpdateStateApproved.Value() == update.State { - ackTotal += 1 - } - } + if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesPending, float64(pendingTotal)); updatesError != nil { + zap.L().Sugar().Errorf("Could not refresh updates pending prometheus metric. Reason: %s", updatesError.Error()) + } + if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesIgnored, float64(ignoredTotal)); updatesError != nil { + zap.L().Sugar().Errorf("Could not refresh updates ignored prometheus metric. Reason: %s", updatesError.Error()) + } + if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesApproved, float64(ackTotal)); updatesError != nil { + zap.L().Sugar().Errorf("Could not refresh updates approved prometheus metric. Reason: %s", updatesError.Error()) + } - if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesPending, float64(pendingTotal)); updatesError != nil { - zap.L().Sugar().Errorf("Could not refresh updates pending prometheus metric. Reason: %s", updatesError.Error()) - } - if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesIgnored, float64(ignoredTotal)); updatesError != nil { - zap.L().Sugar().Errorf("Could not refresh updates ignored prometheus metric. Reason: %s", updatesError.Error()) - } - if updatesError = s.prometheusService.setGaugeNoLabels(metricUpdatesApproved, float64(ackTotal)); updatesError != nil { - zap.L().Sugar().Errorf("Could not refresh updates approved prometheus metric. Reason: %s", updatesError.Error()) - } + var webhooksTotal int64 + var webhooksError error + webhooksTotal, webhooksError = s.webhookService.count() + if webhooksError = s.prometheusService.setGaugeNoLabels(metricWebhooks, float64(webhooksTotal)); webhooksError != nil { + zap.L().Sugar().Errorf("Could not refresh webhooks prometheus metric. Reason: %s", webhooksError.Error()) + } - // webhooks - var webhooksTotal int64 - var webhooksError error - webhooksTotal, webhooksError = s.webhookService.count() - if webhooksError = s.prometheusService.setGaugeNoLabels(metricWebhooks, float64(webhooksTotal)); webhooksError != nil { - zap.L().Sugar().Errorf("Could not refresh webhooks prometheus metric. Reason: %s", webhooksError.Error()) - } + var eventsTotal int64 + var eventsError error + eventsTotal, eventsError = s.eventService.count() + if eventsError = s.prometheusService.setGaugeNoLabels(metricEvents, float64(eventsTotal)); eventsError != nil { + zap.L().Sugar().Errorf("Could not refresh events prometheus metric. Reason: %s", eventsError.Error()) + } - // events - var eventsTotal int64 - var eventsError error - eventsTotal, eventsError = s.eventService.count() - if eventsError = s.prometheusService.setGaugeNoLabels(metricEvents, float64(eventsTotal)); eventsError != nil { - zap.L().Sugar().Errorf("Could not refresh events prometheus metric. Reason: %s", eventsError.Error()) - } + var actionsTotal int64 + var actionsError error + actionsTotal, actionsError = s.actionService.count() + if actionsError = s.prometheusService.setGaugeNoLabels(metricActions, float64(actionsTotal)); actionsError != nil { + zap.L().Sugar().Errorf("Could not refresh actions prometheus metric. Reason: %s", actionsError.Error()) + } + } - // actions - var actionsTotal int64 - var actionsError error - actionsTotal, actionsError = s.actionService.count() - if actionsError = s.prometheusService.setGaugeNoLabels(metricActions, float64(actionsTotal)); actionsError != nil { - zap.L().Sugar().Errorf("Could not refresh actions prometheus metric. Reason: %s", actionsError.Error()) - } - }) - - if err != nil { + scheduledJob := gocron.DurationJob(s.taskConfig.prometheusRefreshInterval) + if _, err := s.scheduler.NewJob(scheduledJob, gocron.NewTask(runnable), gocron.WithName(JobPrometheusRefresh)); err != nil { zap.L().Sugar().Fatalf("Could not create task for refreshing prometheus. Reason: %s", err.Error()) } }