mirror of
https://github.com/acepanel/panel.git
synced 2026-02-04 13:47:15 +08:00
refactor: migrate to chi framework (#165)
* refactor: 重构部分完成 * fix: 添加.gitkeep * fix: build * fix: lint * fix: lint * chore(deps): Update module github.com/go-playground/validator/v10 to v10.22.1 (#162) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update module gorm.io/gorm to v1.25.12 (#161) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update module golang.org/x/net to v0.29.0 (#159) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * workflow: 更新工作流 * workflow: test new download * feat: merge frontend project * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: fix frontend build * workflow: update to ubuntu-24.04 * workflow: rename build-* * workflow: 修改fetch-depth * chore(deps): Update dependency eslint to v9 (#164) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(frontend): update dependences * chore(frontend): fix lint * chore(frontend): fix lint * workflow: add govulncheck * workflow: disable nilaway * feat: 使用新的压缩解压库 * fix: 测试 * fix: 测试 * fix: 测试 * feat: 添加ntp包 * chore(deps): Lock file maintenance (#168) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update module github.com/go-resty/resty/v2 to v2.15.0 (#167) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update dependency @iconify/json to v2.2.249 (#169) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat: 添加限流器 * feat: 调整登录限流 * feat: 证书 * fix: lint * feat: 证书dns * feat: 证书acme账号 * fix: 修改UserID导致的一系列问题 * feat: 低配版任务队列 * feat: 队列完成 * fix: lint * fix: lint * fix: swagger和前端路由 * fix: 去掉ntp测试 * feat: 完成插件接口 * feat: 完成cron * feat: 完成safe * chore(deps): Update dependency vue to v3.5.6 (#170) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update dependency @vueuse/core to v11.1.0 (#171) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update dependency vite to v5.4.6 (#173) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): Update unocss monorepo to v0.62.4 (#172) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore: update renovate config * feat: 新的firewall客户端 * fix: lint * feat: firewall完成 * feat: ssh完成 * feat: 容器完成1/2 * feat: 容器完成 * feat: 文件完成 * feat: systemctl及设置 * fix: windows编译 * fix: session not work * fix: migrate not work * feat: 前端路由 * feat: 初步支持cli --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
耗子
GitHub
16
pkg/queue/job.go
Normal file
16
pkg/queue/job.go
Normal file
@@ -0,0 +1,16 @@
|
||||
package queue
|
||||
|
||||
type Job interface {
|
||||
Handle(args ...any) error
|
||||
}
|
||||
|
||||
type JobWithErrHandle interface {
|
||||
Job
|
||||
ErrHandle(err error)
|
||||
}
|
||||
|
||||
type Jobs struct {
|
||||
Job Job
|
||||
Args []any
|
||||
Delay uint
|
||||
}
|
||||
92
pkg/queue/queue.go
Normal file
92
pkg/queue/queue.go
Normal file
@@ -0,0 +1,92 @@
|
||||
package queue
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Queue struct {
|
||||
jobs chan Jobs
|
||||
isShutdown chan struct{}
|
||||
done chan struct{}
|
||||
}
|
||||
|
||||
func New() *Queue {
|
||||
return &Queue{
|
||||
jobs: make(chan Jobs, 10),
|
||||
isShutdown: make(chan struct{}),
|
||||
done: make(chan struct{}),
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Queue) Push(job Job, args []any) error {
|
||||
select {
|
||||
case <-r.isShutdown:
|
||||
return errors.New("queue is shutdown, cannot add new jobs")
|
||||
default:
|
||||
r.jobs <- Jobs{Job: job, Args: args}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Queue) Bulk(jobs []Jobs) error {
|
||||
for _, job := range jobs {
|
||||
if job.Delay > 0 {
|
||||
time.AfterFunc(time.Duration(job.Delay)*time.Second, func() {
|
||||
select {
|
||||
case <-r.isShutdown:
|
||||
return
|
||||
default:
|
||||
r.jobs <- Jobs{Job: job.Job, Args: job.Args}
|
||||
}
|
||||
})
|
||||
continue
|
||||
}
|
||||
|
||||
select {
|
||||
case <-r.isShutdown:
|
||||
return errors.New("queue is shutdown, cannot add new jobs")
|
||||
default:
|
||||
r.jobs <- job
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *Queue) Later(delay uint, job Job, args []any) error {
|
||||
time.AfterFunc(time.Duration(delay)*time.Second, func() {
|
||||
select {
|
||||
case <-r.isShutdown:
|
||||
return
|
||||
default:
|
||||
r.jobs <- Jobs{Job: job, Args: args}
|
||||
}
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *Queue) Run() {
|
||||
go func() {
|
||||
for {
|
||||
select {
|
||||
case job := <-r.jobs:
|
||||
if err := job.Job.Handle(job.Args...); err != nil {
|
||||
if errJob, ok := job.Job.(JobWithErrHandle); ok {
|
||||
errJob.ErrHandle(err)
|
||||
}
|
||||
}
|
||||
case <-r.isShutdown:
|
||||
close(r.done)
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
func (r *Queue) Shutdown() error {
|
||||
close(r.isShutdown)
|
||||
<-r.done
|
||||
return nil
|
||||
}
|
||||
140
pkg/queue/queue_test.go
Normal file
140
pkg/queue/queue_test.go
Normal file
@@ -0,0 +1,140 @@
|
||||
package queue
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/suite"
|
||||
)
|
||||
|
||||
type QueueTestSuite struct {
|
||||
suite.Suite
|
||||
}
|
||||
|
||||
func TestQueueTestSuite(t *testing.T) {
|
||||
suite.Run(t, &QueueTestSuite{})
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestQueueInitialization() {
|
||||
queue := New()
|
||||
suite.NotNil(queue)
|
||||
suite.NotNil(queue.jobs)
|
||||
suite.NotNil(queue.isShutdown)
|
||||
suite.NotNil(queue.done)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestPushJobToQueue() {
|
||||
queue := New()
|
||||
job := &MockJob{}
|
||||
err := queue.Push(job, []any{"arg1", "arg2"})
|
||||
suite.NoError(err)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestPushJobToShutdownQueue() {
|
||||
queue := New()
|
||||
queue.Run()
|
||||
suite.NoError(queue.Shutdown())
|
||||
job := &MockJob{}
|
||||
err := queue.Push(job, []any{"arg1", "arg2"})
|
||||
suite.Error(err)
|
||||
suite.EqualError(err, "queue is shutdown, cannot add new jobs")
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestBulkJobsToQueue() {
|
||||
queue := New()
|
||||
jobs := []Jobs{
|
||||
{Job: &MockJob{}, Args: []any{"arg1"}},
|
||||
{Job: &MockJob{}, Args: []any{"arg2"}},
|
||||
}
|
||||
err := queue.Bulk(jobs)
|
||||
suite.NoError(err)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestBulkJobsToShutdownQueue() {
|
||||
queue := New()
|
||||
queue.Run()
|
||||
suite.NoError(queue.Shutdown())
|
||||
jobs := []Jobs{
|
||||
{Job: &MockJob{}, Args: []any{"arg1"}},
|
||||
{Job: &MockJob{}, Args: []any{"arg2"}},
|
||||
}
|
||||
err := queue.Bulk(jobs)
|
||||
suite.Error(err)
|
||||
suite.EqualError(err, "queue is shutdown, cannot add new jobs")
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestLaterJobExecution() {
|
||||
queue := New()
|
||||
job := &MockJob{}
|
||||
err := queue.Later(1, job, []any{"arg1"})
|
||||
suite.NoError(err)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestLaterJobExecutionOnShutdownQueue() {
|
||||
queue := New()
|
||||
queue.Run()
|
||||
suite.NoError(queue.Shutdown())
|
||||
job := &MockJob{}
|
||||
err := queue.Later(1, job, []any{"arg1"})
|
||||
suite.NoError(err)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestRunQueue() {
|
||||
queue := New()
|
||||
job := &MockJob{}
|
||||
suite.NoError(queue.Push(job, []any{"arg1"}))
|
||||
queue.Run()
|
||||
time.Sleep(1 * time.Second)
|
||||
suite.True(job.Executed)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestRunQueueWithLaterJob() {
|
||||
queue := New()
|
||||
job := &MockJob{}
|
||||
suite.NoError(queue.Later(1, job, []any{"arg1"}))
|
||||
queue.Run()
|
||||
time.Sleep(2 * time.Second)
|
||||
suite.True(job.Executed)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestRunQueueWithBulkJobs() {
|
||||
queue := New()
|
||||
jobs := []Jobs{
|
||||
{Job: &MockJob{}, Args: []any{"arg1"}},
|
||||
{Job: &MockJob{}, Args: []any{"arg2"}},
|
||||
}
|
||||
suite.NoError(queue.Bulk(jobs))
|
||||
queue.Run()
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestRunQueueWithErrHandle() {
|
||||
queue := New()
|
||||
job := &MockJob{}
|
||||
suite.NoError(queue.Push(job, []any{"arg1"}))
|
||||
queue.Run()
|
||||
time.Sleep(1 * time.Second)
|
||||
suite.Error(job.Err)
|
||||
}
|
||||
|
||||
func (suite *QueueTestSuite) TestShutdownQueue() {
|
||||
queue := New()
|
||||
queue.Run()
|
||||
err := queue.Shutdown()
|
||||
suite.NoError(err)
|
||||
}
|
||||
|
||||
type MockJob struct {
|
||||
Executed bool
|
||||
Err error
|
||||
}
|
||||
|
||||
func (job *MockJob) Handle(args ...any) error {
|
||||
job.Executed = true
|
||||
return errors.New("error")
|
||||
}
|
||||
|
||||
func (job *MockJob) ErrHandle(err error) {
|
||||
job.Err = err
|
||||
}
|
||||
Reference in New Issue
Block a user