tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

delete unused structs

Browse Source
This commit is contained in:
Lunny Xiao
2022-11-25 17:48:45 +08:00
committed by Jason Song
parent 4c2d976629
commit 482832da76
19 changed files with 190 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/bots/bots.go
-3
View File
@@ -25,9 +25,6 @@ func gRPCRouter(r *web.Route, fn grpc.RouteFn) {
}
func Routes(r *web.Route) *web.Route {
// socket connection
r.Get("/socket", socketServe)
gRPCRouter(r, grpc.V1Route)
gRPCRouter(r, grpc.V1AlphaRoute)
gRPCRouter(r, grpc.HealthRoute)
routers/api/bots/runner/runner.go
+2
View File
@@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/core"
bots_model "code.gitea.io/gitea/models/bots"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
runnerv1 "gitea.com/gitea/proto-go/runner/v1"
"gitea.com/gitea/proto-go/runner/v1/runnerv1connect"
@@ -118,6 +119,7 @@ func (s *Service) FetchTask(
var task *runnerv1.Task
if t, ok, err := s.pickTask(ctx, runner); err != nil {
log.Error("pick task failed: %v", err)
return nil, status.Errorf(codes.Internal, "pick task: %v", err)
} else if ok {
task = t
routers/api/bots/scheduler/queue/queue.go
+2 -3
View File
@@ -10,7 +10,6 @@ import (
"time"
"code.gitea.io/gitea/core"
"code.gitea.io/gitea/models/bots"
runnerv1 "gitea.com/gitea/proto-go/runner/v1"
)
@@ -92,7 +91,7 @@ func (q *queue) signal(ctx context.Context) error {
if count == 0 {
return nil
}
items, err := bots.FindStages(ctx, bots.FindStageOptions{})
/*items, err := bots.FindStages(ctx, bots.FindStageOptions{})
if err != nil {
return err
}
@@ -138,7 +137,7 @@ func (q *queue) signal(ctx context.Context) error {
delete(q.workers, w)
break loop
}
}
}*/
return nil
}
routers/api/bots/socket.go
-207
View File
@@ -1,207 +0,0 @@
// Copyright 2022 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package bots
import (
"errors"
"fmt"
"net/http"
"strings"
"time"
"code.gitea.io/gitea/core"
bots_model "code.gitea.io/gitea/models/bots"
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
"github.com/gorilla/websocket"
)
var upgrader = websocket.Upgrader{
ReadBufferSize: 4096,
WriteBufferSize: 4096,
EnableCompression: true,
CheckOrigin: func(r *http.Request) bool {
return true
},
}
var pongWait = 60 * time.Second
type Message struct {
Version int //
Type int // message type, 1 register 2 error 3 task 4 no task
RunnerUUID string // runner uuid
BuildUUID string // build uuid
ErrCode int // error code
ErrContent string // errors message
EventName string
EventPayload string
JobID string // only run the special job, empty means run all the jobs
}
const (
version1 = 1
)
const (
MsgTypeRegister = iota + 1 // register
MsgTypeError // error
MsgTypeRequestBuild // request build task
MsgTypeIdle // no task
MsgTypeBuildResult // build result
MsgTypeBuildJobResult // build job result
)
func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error {
switch msg.Type {
case MsgTypeRegister:
log.Info("websocket[%s] registered", r.RemoteAddr)
runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID)
if err != nil {
if !errors.Is(err, bots_model.ErrRunnerNotExist{}) {
return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err)
}
err = c.WriteMessage(mt, message)
if err != nil {
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
}
} else {
fmt.Printf("-----%v\n", runner)
// TODO: handle read message
err = c.WriteMessage(mt, message)
if err != nil {
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
}
}
case MsgTypeRequestBuild:
// TODO: find new task and send to client
build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID)
if err != nil {
return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err)
}
var returnMsg *Message
if build == nil {
time.Sleep(3 * time.Second)
returnMsg = &Message{
Version: version1,
Type: MsgTypeIdle,
RunnerUUID: msg.RunnerUUID,
}
} else {
returnMsg = &Message{
Version: version1,
Type: MsgTypeRequestBuild,
RunnerUUID: msg.RunnerUUID,
BuildUUID: build.UUID,
EventName: build.Event.Event(),
EventPayload: build.EventPayload,
}
}
bs, err := json.Marshal(&returnMsg)
if err != nil {
return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
}
err = c.WriteMessage(mt, bs)
if err != nil {
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
}
case MsgTypeBuildResult:
log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg)
build, err := bots_model.GetBuildByUUID(msg.BuildUUID)
if err != nil {
return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err)
}
cols := []string{"status", "end_time"}
if msg.ErrCode == 0 {
build.Status = core.StatusPassing
} else {
build.Status = core.StatusFailing
}
build.EndTime = timeutil.TimeStampNow()
if err := bots_model.UpdateBuild(build, cols...); err != nil {
log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err)
}
default:
returnMsg := Message{
Version: version1,
Type: MsgTypeError,
ErrCode: 1,
ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type),
}
bs, err := json.Marshal(&returnMsg)
if err != nil {
return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
}
err = c.WriteMessage(mt, bs)
if err != nil {
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
}
}
return nil
}
func socketServe(w http.ResponseWriter, r *http.Request) {
log.Trace("websocket init request begin from %s", r.RemoteAddr)
c, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Error("websocket upgrade failed: %v", err)
return
}
defer c.Close()
log.Trace("websocket upgrade from %s successfully", r.RemoteAddr)
_ = c.SetReadDeadline(time.Now().Add(pongWait))
c.SetPongHandler(func(string) error {
return c.SetReadDeadline(time.Now().Add(pongWait))
})
for {
// read message from client
mt, message, err := c.ReadMessage()
if err != nil {
if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) ||
websocket.IsCloseError(err, websocket.CloseNormalClosure) {
c.Close()
} else if !strings.Contains(err.Error(), "i/o timeout") {
log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err)
}
break
}
log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message))
// read message first
var msg Message
if err = json.Unmarshal(message, &msg); err != nil {
log.Error("websocket[%s] unmarshal failed: %#v", r.RemoteAddr, err)
break
}
switch msg.Version {
case 1:
if err := handleVersion1(r, c, mt, message, &msg); err != nil {
log.Error("%v", err)
}
default:
returnMsg := Message{
Version: 1,
Type: MsgTypeError,
ErrCode: 1,
ErrContent: "version is not supported",
}
bs, err := json.Marshal(&returnMsg)
if err != nil {
log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
} else {
err = c.WriteMessage(mt, bs)
if err != nil {
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
}
}
}
}
}
routers/init.go
-2
View File
@@ -40,7 +40,6 @@ import (
"code.gitea.io/gitea/services/auth"
"code.gitea.io/gitea/services/auth/source/oauth2"
"code.gitea.io/gitea/services/automerge"
bots_service "code.gitea.io/gitea/services/bots"
"code.gitea.io/gitea/services/cron"
"code.gitea.io/gitea/services/mailer"
markup_service "code.gitea.io/gitea/services/markup"
@@ -162,7 +161,6 @@ func GlobalInitInstalled(ctx context.Context) {
mustInit(pull_service.Init)
mustInit(automerge.Init)
mustInit(task.Init)
mustInit(bots_service.Init)
mustInit(repo_migrations.Init)
eventsource.GetManager().Init()
routers/web/repo/builds/builds.go
+2 -73
View File
@@ -5,7 +5,6 @@
package builds
import (
"fmt"
"net/http"
bots_model "code.gitea.io/gitea/models/bots"
@@ -46,7 +45,7 @@ func List(ctx *context.Context) {
page = 1
}
opts := bots_model.FindBuildOptions{
opts := bots_model.FindRunOptions{
ListOptions: db.ListOptions{
Page: page,
PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")),
@@ -58,7 +57,7 @@ func List(ctx *context.Context) {
} else {
opts.IsClosed = util.OptionalBoolFalse
}
builds, err := bots_model.FindBuilds(opts)
builds, total, err := bots_model.FindRuns(ctx, opts)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
@@ -69,12 +68,6 @@ func List(ctx *context.Context) {
return
}
total, err := bots_model.CountBuilds(opts)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
ctx.Data["Builds"] = builds
pager := context.NewPagination(int(total), opts.PageSize, opts.Page, 5)
@@ -83,67 +76,3 @@ func List(ctx *context.Context) {
ctx.HTML(http.StatusOK, tplListBuilds)
}
func ViewBuild(ctx *context.Context) {
index := ctx.ParamsInt64("index")
build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
ctx.Data["Name"] = build.Name + " - " + ctx.Tr("repo.builds")
ctx.Data["PageIsBuildList"] = true
ctx.Data["Build"] = build
statuses, err := bots_model.GetBuildWorkflows(build.ID)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
ctx.Data["WorkflowsStatuses"] = statuses
ctx.HTML(http.StatusOK, tplViewBuild)
}
func GetBuildJobLogs(ctx *context.Context) {
index := ctx.ParamsInt64("index")
build, err := bots_model.GetBuildByRepoAndIndex(ctx.Repo.Repository.ID, index)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
workflows, err := bots_model.GetBuildWorkflows(build.ID)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
var buildJob *bots_model.BuildStage
wf := ctx.Params("workflow")
jobname := ctx.Params("jobname")
LOOP_WORKFLOWS:
for workflow, jobs := range workflows {
if workflow == wf {
for _, job := range jobs {
if jobname == job.Name {
buildJob = job
break LOOP_WORKFLOWS
}
}
}
}
if buildJob == nil {
ctx.Error(http.StatusNotFound, fmt.Sprintf("workflow %s job %s not exist", wf, jobname))
return
}
// TODO: if buildJob.LogToFile is true, read the logs from the file
logs, err := bots_model.GetBuildLogs(build.ID, buildJob.ID)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
}
ctx.JSON(http.StatusOK, logs)
}
routers/web/web.go
+8 -4
View File
@@ -1189,10 +1189,14 @@ func RegisterRoutes(m *web.Route) {
m.Group("/builds", func() {
m.Get("", builds.List)
m.Group("/{index}", func() {
m.Get("", builds.ViewBuild)
m.Get("/{workflow}/job/{jobname}/logs", builds.GetBuildJobLogs)
})
m.Combo("/run/{runid}").
Get(dev.BuildView).
Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost)
m.Combo("/run/{runid}/jobs/{jobid}").
Get(dev.BuildView).
Post(bindIgnErr(dev.BuildViewRequest{}), dev.BuildViewPost)
}, reqRepoBuildsReader, builds.MustEnableBuilds)
m.Group("/wiki", func() {