sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
YouROK
2021-05-08 21:55:40 +03:00
parent abd29ad676 5d6b32d3f1
commit db256468ae
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/cmd/preconfig_pos.go
View File

@@ -15,7 +15,7 @@ func Preconfig(dkill bool) {
signal.Notify(sigc, signal.Notify(sigc,
syscall.SIGHUP, syscall.SIGHUP,
syscall.SIGINT, syscall.SIGINT,
syscall.SIGSTOP,
syscall.SIGPIPE, syscall.SIGPIPE,
syscall.SIGTERM, syscall.SIGTERM,
syscall.SIGQUIT) syscall.SIGQUIT)

5
server/settings/db.go
View File

@@ -4,8 +4,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
bolt "go.etcd.io/bbolt"
"server/log" "server/log"
bolt "go.etcd.io/bbolt"
) )
type TDB struct { type TDB struct {
@@ -99,7 +100,6 @@ func (v *TDB) Set(xpath, name string, value []byte) {
log.TLogln("value:", value) log.TLogln("value:", value)
} }
return
} }
func (v *TDB) List(xpath string) []string { func (v *TDB) List(xpath string) []string {
@@ -173,5 +173,4 @@ func (v *TDB) Rem(xpath, name string) {
log.TLogln("Error rem sets", xpath+"/"+name, ", error:", err) log.TLogln("Error rem sets", xpath+"/"+name, ", error:", err)
} }
return
} }

4
server/torr/storage/torrstor/cache.go
View File

@@ -101,9 +101,7 @@ func (c *Cache) Piece(m metainfo.Piece) storage.PieceImpl {
func (c *Cache) Close() error { func (c *Cache) Close() error {
log.TLogln("Close cache for:", c.hash) log.TLogln("Close cache for:", c.hash)
if _, ok := c.storage.caches[c.hash]; ok { delete(c.storage.caches, c.hash)
delete(c.storage.caches, c.hash)
}
c.pieces = nil c.pieces = nil
c.muReaders.Lock() c.muReaders.Lock()

4
server/torr/torrent.go
View File

@@ -359,9 +359,7 @@ func (t *Torrent) Close() {
t.Stat = state.TorrentClosed t.Stat = state.TorrentClosed
t.bt.mu.Lock() t.bt.mu.Lock()
if _, ok := t.bt.torrents[t.Hash()]; ok { delete(t.bt.torrents, t.Hash())
delete(t.bt.torrents, t.Hash())
}
t.bt.mu.Unlock() t.bt.mu.Unlock()
t.drop() t.drop()

2
server/web/api/stream.go
View File

@@ -211,5 +211,5 @@ func streamNoAuth(c *gin.Context) {
} }
c.Header("WWW-Authenticate", "Basic realm=Authorization Required") c.Header("WWW-Authenticate", "Basic realm=Authorization Required")
c.AbortWithStatus(http.StatusUnauthorized) c.AbortWithStatus(http.StatusUnauthorized)
return
} }