Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/grumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2019-12-21 01:54:39 +0300
committerGitHub <noreply@github.com>2019-12-21 01:54:39 +0300
commitbbb589fb37cc21819834820c7b54665937203d26 (patch)
treeb5fda82107fad4a24e7a01f33a6ca94db5720007
parentcac44edebb68c62af98034d9b86192789a479104 (diff)
parentf8246ffbbc01eccb4262db921d9657385cd25fbd (diff)
Merge PR #46: Set freezelog to nil after closing it
-rw-r--r--cmd/grumble/freeze.go1
-rw-r--r--cmd/grumble/freeze_unix.go1
-rw-r--r--cmd/grumble/freeze_windows.go1
3 files changed, 3 insertions, 0 deletions
diff --git a/cmd/grumble/freeze.go b/cmd/grumble/freeze.go
index 530cfb3..a8dbcfe 100644
--- a/cmd/grumble/freeze.go
+++ b/cmd/grumble/freeze.go
@@ -49,6 +49,7 @@ func (server *Server) openFreezeLog() error {
if err != nil {
return err
}
+ server.freezelog = nil
}
logfn := filepath.Join(Args.DataDir, "servers", strconv.FormatInt(server.Id, 10), "log.fz")
diff --git a/cmd/grumble/freeze_unix.go b/cmd/grumble/freeze_unix.go
index 539b9f9..5974539 100644
--- a/cmd/grumble/freeze_unix.go
+++ b/cmd/grumble/freeze_unix.go
@@ -22,6 +22,7 @@ func (server *Server) freezeToFile() (err error) {
if err != nil {
return err
}
+ server.freezelog = nil
}
// Make sure the whole server is synced to disk
diff --git a/cmd/grumble/freeze_windows.go b/cmd/grumble/freeze_windows.go
index 2162110..8d967e7 100644
--- a/cmd/grumble/freeze_windows.go
+++ b/cmd/grumble/freeze_windows.go
@@ -21,6 +21,7 @@ func (server *Server) freezeToFile() (err error) {
if err != nil {
return err
}
+ server.freezelog = nil
}
// Make sure the whole server is synced to disk