hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove reboot for unrebootable pools

Browse Source
This commit is contained in:
Ben Sarmiento
2024-01-28 21:38:22 +01:00
parent 573cfa1436
commit 4ff88372bc
3 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/config/types.go
View File

@@ -177,14 +177,14 @@ func (z *ZurgConfig) EnableDownloadMount() bool {
func (z *ZurgConfig) GetApiTimeoutSecs() int { func (z *ZurgConfig) GetApiTimeoutSecs() int {
if z.ApiTimeoutSecs == 0 { if z.ApiTimeoutSecs == 0 {
return 4 return 30
} }
return z.ApiTimeoutSecs return z.ApiTimeoutSecs
} }
func (z *ZurgConfig) GetDownloadTimeoutSecs() int { func (z *ZurgConfig) GetDownloadTimeoutSecs() int {
if z.DownloadTimeoutSecs == 0 { if z.DownloadTimeoutSecs == 0 {
return 2 return 15
} }
return z.DownloadTimeoutSecs return z.DownloadTimeoutSecs
} }

18
internal/handlers/home.go
View File

@@ -243,8 +243,6 @@ func (zr *Handlers) handleHome(resp http.ResponseWriter, req *http.Request) {
<td colspan="2"> <td colspan="2">
<button type="button" onclick="window.open('/logs/upload')">Upload logs</button> <button type="button" onclick="window.open('/logs/upload')">Upload logs</button>
<button type="button" onclick="window.open('/reboot/worker')">Reboot worker pool</button> <button type="button" onclick="window.open('/reboot/worker')">Reboot worker pool</button>
<button type="button" onclick="window.open('/reboot/refresh')">Reboot refresh pool</button>
<button type="button" onclick="window.open('/reboot/repair')">Reboot repair pool</button>
</td> </td>
</tr> </tr>
</table> </table>
@@ -312,22 +310,6 @@ func (zr *Handlers) handleRebootWorkerPool(resp http.ResponseWriter, req *http.R
fmt.Fprint(resp, "Rebooted worker pool, please close this window") 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 { func bToMb(b uint64) uint64 {
return b / 1024 / 1024 return b / 1024 / 1024
} }

2
internal/handlers/router.go
View File

@@ -55,8 +55,6 @@ func AttachHandlers(router *chi.Mux, downloader *universal.Downloader, torMgr *t
router.Get("/", hs.handleHome) router.Get("/", hs.handleHome)
router.Get("/reboot/worker", hs.handleRebootWorkerPool) router.Get("/reboot/worker", hs.handleRebootWorkerPool)
router.Get("/reboot/refresh", hs.handleRebootRefreshPool)
router.Get("/reboot/repair", hs.handleRebootRepairPool)
// version // version
router.Get(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleVersionFile) router.Get(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleVersionFile)
router.Head(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleCheckVersionFile) router.Head(fmt.Sprintf("/{mountType}/%s", version.FILE), hs.handleCheckVersionFile)