From d77f8843a7ec3cbda51a4da1f96e94b5e62131bb Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 18 Nov 2012 17:57:08 +0100 Subject: [PATCH] grumble: fix unix build, freeze_unix.go was missing imports. --- freeze_unix.go | 106 ++++++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/freeze_unix.go b/freeze_unix.go index eaea0ec..d093b43 100644 --- a/freeze_unix.go +++ b/freeze_unix.go @@ -1,49 +1,57 @@ -// Copyright (c) 2012 The Grumble Authors -// The use of this source code is goverened by a BSD-style -// license that can be found in the LICENSE-file. - -// +build !windows - -package main - -func (server *Server) freezeToFile() (err error) { - // Close the log file, if it's open - if server.freezelog != nil { - err = server.freezelog.Close() - if err != nil { - return err - } - } - - // Make sure the whole server is synced to disk - fs, err := server.Freeze() - if err != nil { - return err - } - f, err := ioutil.TempFile(filepath.Join(Args.DataDir, "servers", strconv.FormatInt(server.Id, 10)), ".main.fz_") - if err != nil { - return err - } - buf, err := proto.Marshal(fs) - if err != nil { - return err - } - _, err = f.Write(buf) - if err != nil { - return err - } - err = f.Sync() - if err != nil { - return err - } - err = f.Close() - if err != nil { - return err - } - err = os.Rename(f.Name(), filepath.Join(Args.DataDir, "servers", strconv.FormatInt(server.Id, 10), "main.fz")) - if err != nil { - return err - } - - return nil -} \ No newline at end of file +// Copyright (c) 2012 The Grumble Authors +// The use of this source code is goverened by a BSD-style +// license that can be found in the LICENSE-file. + +// +build !windows + +package main + +import ( + "code.google.com/p/goprotobuf/proto" + "io/ioutil" + "os" + "path/filepath" + "strconv" +) + +func (server *Server) freezeToFile() (err error) { + // Close the log file, if it's open + if server.freezelog != nil { + err = server.freezelog.Close() + if err != nil { + return err + } + } + + // Make sure the whole server is synced to disk + fs, err := server.Freeze() + if err != nil { + return err + } + f, err := ioutil.TempFile(filepath.Join(Args.DataDir, "servers", strconv.FormatInt(server.Id, 10)), ".main.fz_") + if err != nil { + return err + } + buf, err := proto.Marshal(fs) + if err != nil { + return err + } + _, err = f.Write(buf) + if err != nil { + return err + } + err = f.Sync() + if err != nil { + return err + } + err = f.Close() + if err != nil { + return err + } + err = os.Rename(f.Name(), filepath.Join(Args.DataDir, "servers", strconv.FormatInt(server.Id, 10), "main.fz")) + if err != nil { + return err + } + + return nil +}