From 4ff88372bc2fb06322e049397771cf0efbea6ea5 Mon Sep 17 00:00:00 2001 From: Ben Sarmiento Date: Sun, 28 Jan 2024 21:38:22 +0100 Subject: [PATCH] Remove reboot for unrebootable pools --- internal/config/types.go | 4 ++-- internal/handlers/home.go | 18 ------------------ internal/handlers/router.go | 2 -- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/internal/config/types.go b/internal/config/types.go index ff44f27..46e146c 100644 --- a/internal/config/types.go +++ b/internal/config/types.go @@ -177,14 +177,14 @@ func (z *ZurgConfig) EnableDownloadMount() bool { func (z *ZurgConfig) GetApiTimeoutSecs() int { if z.ApiTimeoutSecs == 0 { - return 4 + return 30 } return z.ApiTimeoutSecs } func (z *ZurgConfig) GetDownloadTimeoutSecs() int { if z.DownloadTimeoutSecs == 0 { - return 2 + return 15 } return z.DownloadTimeoutSecs } diff --git a/internal/handlers/home.go b/internal/handlers/home.go index 38bcb26..8e271c1 100644 --- a/internal/handlers/home.go +++ b/internal/handlers/home.go @@ -243,8 +243,6 @@ func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) { - - @@ -312,22 +310,6 @@ func (zr *Handlers) handleRebootWorkerPool(resp http.ResponseWriter, req *http.R fmt.Fprint(resp, "Rebooted worker pool, please close this window") } -func (zr *Handlers) handleRebootRefreshPool(resp http.ResponseWriter, req *http.Request) { - zr.refreshPool.Release() - // zr.refreshPool.Reboot() - // zr.torMgr.StartRefreshJob() - zr.log.Infof("Rebooted refresh pool") - fmt.Fprint(resp, "Rebooted refresh pool, please close this window") -} - -func (zr *Handlers) handleRebootRepairPool(resp http.ResponseWriter, req *http.Request) { - zr.repairPool.Release() - // zr.repairPool.Reboot() - // zr.torMgr.StartRepairJob() - zr.log.Infof("Rebooted repair pool") - fmt.Fprint(resp, "Rebooted repair pool, please close this window") -} - func bToMb(b uint64) uint64 { return b / 1024 / 1024 } diff --git a/internal/handlers/router.go b/internal/handlers/router.go index 7b2148b..84b7a9c 100644 --- a/internal/handlers/router.go +++ b/internal/handlers/router.go @@ -55,8 +55,6 @@ func AttachHandlers(router *chi.Mux, downloader *universal.Downloader, torMgr *t router.Get("/", hs.handleHome) router.Get("/reboot/worker", hs.handleRebootWorkerPool) - router.Get("/reboot/refresh", hs.handleRebootRefreshPool) - router.Get("/reboot/repair", hs.handleRebootRepairPool) // version router.Get(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleVersionFile) router.Head(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleCheckVersionFile)