Develop dxyinme (#6)

* update documentation * update documentation * update task_metrics table to save the running node * update documentation * update * update * update * update
dxyinme · Dec 27, 2023 · 02131eb · 02131eb
1 parent 9f3c2ba
commit 02131eb
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 5 deletions.
diff --git a/app/controllers/taskcontroller.go b/app/controllers/taskcontroller.go
@@ -156,3 +156,18 @@ func (tc *TaskController) Get(ctx *gin.Context) {
 	response.FromDBTask(&taskData)
 	ctx.JSON(http.StatusOK, &response)
 }
+
+// Task Metrics godoc
+//
+//	@Summary 					Get task running metric
+//	@Description			Get task running metric
+//	@Tags 						task
+//	@Accept 					json
+//	@Produce 					json
+//	@Param						taskName path string true "task name"
+//	@Param						body body types.TaskMetricsReq true "task metrics request"
+//	@Success 					200 {object} types.TaskMetricsResp
+//	@Router 					/tasks/{taskName}/metrics [get]
+func (tc *TaskController) GetMetric(ctx *gin.Context) {
+
+}
diff --git a/app/go.mod b/app/go.mod
@@ -1,6 +1,6 @@
 module app
 
-go 1.18
+go 1.19
 
 require (
 	github.com/gin-gonic/gin v1.9.0

diff --git a/app/internal/common/innercall/innercall.go b/app/internal/common/innercall/innercall.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/go-redis/redis/v8"
+	redis "github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/app/internal/crontasks/crontaskscontainer.go b/app/internal/crontasks/crontaskscontainer.go
@@ -5,9 +5,9 @@ import (
 	"app/internal/db"
 	"time"
 
-	redis "github.com/go-redis/redis/v8"
 	"github.com/libi/dcron"
 	"github.com/libi/dcron/driver"
+	redis "github.com/redis/go-redis/v9"
 	"github.com/sirupsen/logrus"
 )
 

diff --git a/app/types/webmodels.go b/app/types/webmodels.go
@@ -41,3 +41,14 @@ type DB struct {
 	CustomerName string `json:"customerName" binding:"required"`
 	DBBase
 }
+
+// TaskMetricsReq example
+type TaskMetricsReq struct {
+	BeginTime int `json:"beginTime" binding:"optional"`
+	EndTime   int `json:"endTime" binding:"optional"`
+}
+
+// TaskMetricsResp example
+type TaskMetricsResp struct {
+	TaskBase
+}
diff --git a/dcron b/dcron
diff --git a/go.work b/go.work
@@ -1,4 +1,4 @@
-go 1.18
+go 1.19
 
 use (
 	./app

diff --git a/go.work.sum b/go.work.sum
@@ -1,3 +1,15 @@
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
+1 −1		.github/workflows/test.yml
+21 −0		cron/LICENSE
+3 −0		cron/README.md
+97 −0		cron/chain.go
+244 −0		cron/chain_test.go
+27 −0		cron/constantdelay.go
+54 −0		cron/constantdelay_test.go
+357 −0		cron/cron.go
+696 −0		cron/cron_test.go
+231 −0		cron/doc.go
+15 −0		cron/logger.go
+47 −0		cron/option.go
+21 −0		cron/option_test.go
+434 −0		cron/parser.go
+383 −0		cron/parser_test.go
+188 −0		cron/spec.go
+300 −0		cron/spec_test.go
+1 −1		dcron.go
+52 −3		dcron_test.go
+27 −11		dlog/logger.go
+1 −1		driver/driver.go
+3 −3		driver/redisdriver.go
+1 −1		driver/redisdriver_test.go
+3 −3		driver/rediszsetdriver.go
+1 −1		driver/rediszsetdriver_test.go
+1 −1		driver/util.go
+1 −1		examples/example/example.go
+1 −1		examples/stablejob/stablejob.go
+1 −1		examples/tools/tools.go
+75 −9		go.mod
+89 −340		go.sum
+1 −1		inodepool_test.go
+3 −3		job_warpper.go
+4 −5		option.go
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    go 1.18
+    go 1.19
     use (
     	./app
@@ Expand Down @@