aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdzell <derz@elidragon.com>2022-04-20 21:48:43 +0200
committerEdzell <derz@elidragon.com>2022-04-20 21:48:43 +0200
commit729da09ada43394271c3a2f88253d5c4035072a6 (patch)
tree6e395806b96d748ee406870d784626b18c5c77d1
parente22d5ad40c90a383e26a21bd1aa01807d2a97393 (diff)
parentf1e68fd27e5441d04be7110d618ea07f02bffe00 (diff)
Merge branch 'main' of https://github.com/ev2-1/mt-multiserver-proxy
-rw-r--r--mediacache.go1
-rw-r--r--run.go1
2 files changed, 1 insertions, 1 deletions
diff --git a/mediacache.go b/mediacache.go
index c949959..a812c94 100644
--- a/mediacache.go
+++ b/mediacache.go
@@ -9,7 +9,6 @@ import (
func (cc *contentConn) fromCache(filename, base64SHA1 string) bool {
os.Mkdir(Path("cache"), 0777)
-
hash, err := b64.DecodeString(base64SHA1)
if err != nil {
cc.log("<-", base64SHA1, ": ", err)
diff --git a/run.go b/run.go
index 3dce801..f7ca66f 100644
--- a/run.go
+++ b/run.go
@@ -79,6 +79,7 @@ func runFunc() {
for cc := range clts {
go func(cc *ClientConn) {
cc.Kick("Proxy shutting down.")
+ <-cc.Closed()
wg.Done()
}(cc)
}