CEF/grumble
1
0
Fork 0
forked from External/grumble
Code Pull requests Activity

Re-add SQLite import support, but make it a build-time option.

Browse source
This commit is contained in:
Mikkel Krautz 2011-08-27 20:52:06 +02:00
parent 48efaf6645
commit 4d5b897d66
11 changed files with 265 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
freeze.go
View file

@ -34,7 +34,7 @@ func (server *Server) FreezeToFile() (err os.Error) {
if err != nil {
return err
}
f, err := ioutil.TempFile(filepath.Join(*datadir, strconv.Itoa64(server.Id)), ".main.fz_")
f, err := ioutil.TempFile(filepath.Join(Args.DataDir, strconv.Itoa64(server.Id)), ".main.fz_")
if err != nil {
return err
}
@ -54,7 +54,7 @@ func (server *Server) FreezeToFile() (err os.Error) {
if err != nil {
return err
}
err = os.Rename(f.Name(), filepath.Join(*datadir, strconv.Itoa64(server.Id), "main.fz"))
err = os.Rename(f.Name(), filepath.Join(Args.DataDir, strconv.Itoa64(server.Id), "main.fz"))
if err != nil {
return err
}
@ -70,7 +70,7 @@ func (server *Server) FreezeToFile() (err os.Error) {
// Open a new freeze log
func (server *Server) openFreezeLog() (err os.Error) {
logfn := filepath.Join(*datadir, strconv.Itoa64(server.Id), "log.fz")
logfn := filepath.Join(Args.DataDir, strconv.Itoa64(server.Id), "log.fz")
err = os.Remove(logfn)
if pe, ok := err.(*os.PathError); ok && pe.Error == os.ENOENT {
// OK. File does not exist...
@ -388,7 +388,7 @@ func NewServerFromFrozen(name string) (s *Server, err os.Error) {
return nil, err
}
path := filepath.Join(*datadir, name)
path := filepath.Join(Args.DataDir, name)
mainFile := filepath.Join(path, "main.fz")
logFile := filepath.Join(path, "log.fz")