Fix logic for resource usage -- include disk and reset to 0 when stopped

This commit is contained in:
Dane Everitt
2019-08-17 16:10:48 -07:00
parent c8e6e29abc
commit 9a4f1672f7
3 changed files with 21 additions and 9 deletions

View File

@@ -130,13 +130,15 @@ func (fs *Filesystem) HasSpaceAvailable() bool {
if size, err := fs.DirectorySize("/"); err != nil {
zap.S().Warnw("failed to determine directory size", zap.String("server", fs.Server.Uuid), zap.Error(err))
} else {
fs.Server.Cache.Set("disk_used", size, time.Minute*5)
fs.Server.Cache.Set("disk_used", size, time.Second * 60)
}
}
// Determine if their folder size, in bytes, is smaller than the amount of space they've
// been allocated.
return (size / 1024.0 / 1024.0) <= space
fs.Server.Resources.Disk = size
return (size / 1000.0 / 1000.0) <= space
}
// Determines the directory size of a given location by running parallel tasks to iterate