diff --git a/Makefile b/Makefile index 3e341b0..3c946ab 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ GOFILES = \ acl.go \ group.go \ murmurdb.go \ - json.go + freeze.go .PHONY: grumble grumble: pkg diff --git a/json.go b/freeze.go similarity index 97% rename from json.go rename to freeze.go index bb3eaf2..7fa645c 100644 --- a/json.go +++ b/freeze.go @@ -1,9 +1,9 @@ package main import ( - "json" + "compress/gzip" + "gob" "os" - "compress/zlib" ) type frozenServer struct { @@ -134,13 +134,13 @@ func NewServerFromFrozen(filename string) (s *Server, err os.Error) { } defer descFile.Close() - zr, err := zlib.NewReader(descFile) + zr, err := gzip.NewReader(descFile) if err != nil { return nil, err } fs := new(frozenServer) - decoder := json.NewDecoder(zr) + decoder := gob.NewDecoder(zr) decoder.Decode(&fs) s, err = NewServer(int64(fs.Id), "", int(DefaultPort+fs.Id-1)) diff --git a/grumble.go b/grumble.go index f8fc743..ece3afe 100644 --- a/grumble.go +++ b/grumble.go @@ -5,13 +5,13 @@ package main import ( + "compress/gzip" "flag" "fmt" + "gob" "os" "log" - "json" "sqlite" - "compress/zlib" "path/filepath" ) @@ -61,14 +61,14 @@ func MurmurImport(filename string) (err os.Error) { return } - zf, err := zlib.NewWriterLevel(f, zlib.BestCompression) + zf, err := gzip.NewWriterLevel(f, gzip.BestCompression) fz, err := m.Freeze() if err != nil { log.Fatalf("Unable to freeze server: %s", err.String()) } - enc := json.NewEncoder(zf) + enc := gob.NewEncoder(zf) err = enc.Encode(fz) if err != nil { log.Printf("%s", err.String())