From ea2903c6b9c60acd08d0dcfefae5b095874c5420 Mon Sep 17 00:00:00 2001
From: Ola Bini <ola@autonomia.digital>
Date: Fri, 20 Dec 2019 22:18:59 +0000
Subject: [PATCH] Set freezelog to nil after closing it. Also rearrange some of
 the imports based on go fmt rules

---
 cmd/grumble/freeze.go         | 12 +++++++-----
 cmd/grumble/freeze_unix.go    |  4 +++-
 cmd/grumble/freeze_windows.go |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cmd/grumble/freeze.go b/cmd/grumble/freeze.go
index b2937a2..a8dbcfe 100644
--- a/cmd/grumble/freeze.go
+++ b/cmd/grumble/freeze.go
@@ -6,19 +6,20 @@ package main
 
 import (
 	"errors"
-	"github.com/golang/protobuf/proto"
 	"io"
 	"io/ioutil"
 	"log"
+	"os"
+	"path/filepath"
+	"strconv"
+	"time"
+
+	"github.com/golang/protobuf/proto"
 	"mumble.info/grumble/pkg/acl"
 	"mumble.info/grumble/pkg/ban"
 	"mumble.info/grumble/pkg/freezer"
 	"mumble.info/grumble/pkg/mumbleproto"
 	"mumble.info/grumble/pkg/serverconf"
-	"os"
-	"path/filepath"
-	"strconv"
-	"time"
 )
 
 // Freeze a server to disk and closes the log file.
@@ -48,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 9eea130..5974539 100644
--- a/cmd/grumble/freeze_unix.go
+++ b/cmd/grumble/freeze_unix.go
@@ -7,11 +7,12 @@
 package main
 
 import (
-	"github.com/golang/protobuf/proto"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
+
+	"github.com/golang/protobuf/proto"
 )
 
 func (server *Server) freezeToFile() (err error) {
@@ -21,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 bc432b4..8d967e7 100644
--- a/cmd/grumble/freeze_windows.go
+++ b/cmd/grumble/freeze_windows.go
@@ -5,12 +5,13 @@
 package main
 
 import (
-	"github.com/golang/protobuf/proto"
 	"io/ioutil"
-	"mumble.info/grumble/pkg/replacefile"
 	"os"
 	"path/filepath"
 	"strconv"
+
+	"github.com/golang/protobuf/proto"
+	"mumble.info/grumble/pkg/replacefile"
 )
 
 func (server *Server) freezeToFile() (err error) {
@@ -20,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