go-shiori/shiori
1
1
Fork 0
mirror of https://github.com/go-shiori/shiori.git synced 2025-02-22 15:06:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix: archive is never closed

Browse source
This commit is contained in:
Radhi Fadlillah 2019-08-06 20:51:06 +07:00
parent cc097f50c8
commit 1399e0fc9f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/webserver/server.go
View file

@ -6,6 +6,7 @@ import (
"time" "time"
"github.com/go-shiori/shiori/internal/database" "github.com/go-shiori/shiori/internal/database"
"github.com/go-shiori/shiori/pkg/warc"
"github.com/julienschmidt/httprouter" "github.com/julienschmidt/httprouter"
cch "github.com/patrickmn/go-cache" cch "github.com/patrickmn/go-cache"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -24,6 +25,11 @@ func ServeApp(DB database.DB, dataDir string, port int) error {
ArchiveCache: cch.New(time.Minute, 5*time.Minute), ArchiveCache: cch.New(time.Minute, 5*time.Minute),
} }
hdl.ArchiveCache.OnEvicted(func(key string, data interface{}) {
archive := data.(*warc.Archive)
archive.Close()
})
// Create router // Create router
router := httprouter.New() router := httprouter.New()

1
pkg/warc/writer.go
View file

@ -54,6 +54,7 @@ func NewArchive(req ArchivalRequest, dstPath string) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create archive: %v", err) return fmt.Errorf("failed to create archive: %v", err)
} }
defer db.Close()
// Create archiver // Create archiver
arc := &archiver.Archiver{ arc := &archiver.Archiver{