MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update all of the old UUID refs to new

Browse Source
This commit is contained in:
Dane Everitt
2020-07-19 17:53:41 -07:00
parent 5079c67aee
commit cb850fd81a
11 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/update.go
View File

@@ -23,7 +23,7 @@ func (s *Server) UpdateDataStructure(data []byte, background bool) error {
// Don't allow obviously corrupted data to pass through into this function. If the UUID
// doesn't match something has gone wrong and the API is attempting to meld this server
// instance into a totally different one, which would be bad.
if src.Uuid != "" && s.Uuid != "" && src.Uuid != s.Uuid {
if src.Uuid != "" && s.Id() != "" && src.Uuid != s.Id() {
return errors.New("attempting to merge a data stack with an invalid UUID")
}
@@ -95,7 +95,6 @@ func (s *Server) UpdateDataStructure(data []byte, background bool) error {
// Update the configuration once we have a lock on the configuration object.
s.cfg = c
s.Uuid = c.Uuid
if background {
go s.runBackgroundActions()