diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 63ab9b6e..09e492ea 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -37,6 +37,7 @@ services: environment: - PEBBLE_VA_NOSLEEP=1 - PEBBLE_VA_ALWAYS_VALID=1 + - PEBBLE_WFE_NONCEREJECT=0 networks: nginxui: challtestsrv: diff --git a/app/vite.config.ts b/app/vite.config.ts index 8160a0fa..5d83d97c 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -82,7 +82,7 @@ export default defineConfig(({ mode }) => { changeOrigin: true, secure: false, ws: true, - timeout: 5000, + timeout: 60000, agent: new Agent({ keepAlive: false, }), diff --git a/internal/cert/auto_cert.go b/internal/cert/auto_cert.go index 98136b56..6b6be759 100644 --- a/internal/cert/auto_cert.go +++ b/internal/cert/auto_cert.go @@ -113,4 +113,6 @@ func autoCert(certModel *model.Cert) { notification.Error("Sync Certificate Error", err.Error()) return } + + close(logChan) } diff --git a/internal/cert/cert.go b/internal/cert/cert.go index b88cf8d4..741aa631 100644 --- a/internal/cert/cert.go +++ b/internal/cert/cert.go @@ -33,6 +33,7 @@ func IssueCert(payload *ConfigPayload, logChan chan string, errChan chan error) // initial a channelWriter to receive logs cw := NewChannelWriter() defer close(errChan) + defer close(cw.Ch) // initial a logger l := log.New(os.Stderr, "", log.LstdFlags) diff --git a/internal/cron/cron.go b/internal/cron/cron.go index 6bef9108..ede41678 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -1,13 +1,14 @@ package cron import ( + "time" + "github.com/0xJacky/Nginx-UI/internal/cert" "github.com/0xJacky/Nginx-UI/internal/logrotate" "github.com/0xJacky/Nginx-UI/query" "github.com/0xJacky/Nginx-UI/settings" "github.com/go-co-op/gocron/v2" "github.com/uozi-tech/cosy/logger" - "time" ) var s gocron.Scheduler @@ -25,7 +26,8 @@ var logrotateJob gocron.Job func InitCronJobs() { _, err := s.NewJob(gocron.DurationJob(30*time.Minute), gocron.NewTask(cert.AutoCert), - gocron.WithSingletonMode(gocron.LimitModeWait)) + gocron.WithSingletonMode(gocron.LimitModeWait), + gocron.JobOption(gocron.WithStartImmediately())) if err != nil { logger.Fatalf("AutoCert Err: %v\n", err) }