From ff7f92895cbebf38595a9e05b36d45caee22af06 Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Wed, 5 Aug 2020 21:13:01 -0600 Subject: [PATCH] Fix race condition on startup --- Makefile | 2 +- server/loader.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8db5e0c..8bb1ae9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: - GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -gcflags "all=-trimpath=/Users/dane/Sites/development/code" -o build/wings_linux_amd64 -v wings.go + GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -gcflags "all=-trimpath=$(PWD)" -o build/wings_linux_amd64 -v wings.go compress: upx --brute build/wings_* diff --git a/server/loader.go b/server/loader.go index 7e10cc7..9ee46e7 100644 --- a/server/loader.go +++ b/server/loader.go @@ -104,15 +104,15 @@ func FromConfiguration(data *api.ServerConfigurationResponse) (*Server, error) { Server: s, } - // If the server's data directory exists, force disk usage calculation. - if _, err := os.Stat(s.Filesystem.Path()); err == nil { - go s.Filesystem.HasSpaceAvailable() - } - // Forces the configuration to be synced with the panel. if err := s.SyncWithConfiguration(data); err != nil { return nil, err } + // If the server's data directory exists, force disk usage calculation. + if _, err := os.Stat(s.Filesystem.Path()); err == nil { + go s.Filesystem.HasSpaceAvailable() + } + return s, nil }