jpt
/
edgeboxctl
mirror of https://github.com/edgebox-iot/edgeboxctl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup, small fixes

pull/13/head
Paulo Truta 2021-06-07 22:47:38 +00:00
parent 5d92e213ee
commit 4dec81e487
2 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
internal/storage/storage.go
View File

@ -186,49 +186,58 @@ func getDevicesSpaceUsage(devices []Device) []Device {
for partitionIndex, partition := range device.Partitions { for partitionIndex, partition := range device.Partitions {
s, _ := disk.Usage(partition.Mountpoint) if partition.Mountpoint != "" {
if s.Total == 0 {
continue
}
partitionUsagePercent := fmt.Sprintf("%2.f%%", s.UsedPercent) s, _ := disk.Usage(partition.Mountpoint)
edgeappsDirSize, err := getDirSize(utils.GetPath("edgeAppsPath")) if s.Total == 0 {
// TODO for later: Figure out to get correct paths for each partition... continue
// wsAppDataDirSize, err := getDirSize("/home/system/components/ws/appdata") }
edgeappsUsageSplit := (uint64)(0) partitionUsagePercent := fmt.Sprintf("%2.f%%", s.UsedPercent)
if partition.Mountpoint == "/" && err == nil { osUsageSplit := (uint64)(0)
// edgeappsUsageSplit = edgeappsDirSize + wsAppDataDirSize edgeappsUsageSplit := (uint64)(0)
edgeappsUsageSplit = edgeappsDirSize bucketsUsageSplit := (uint64)(0)
deviceUsageStat.UsageSplit.EdgeApps += edgeappsUsageSplit othersUsageSplit := (uint64)(0)
}
bucketsUsageSplit := (uint64)(0) edgeappsDirSize, _ := getDirSize(utils.GetPath("edgeAppsPath"))
othersUsageSplit := (uint64)(0) // TODO for later: Figure out to get correct paths for each partition...
osUsageSplit := (s.Used - othersUsageSplit - bucketsUsageSplit - edgeappsUsageSplit) wsAppDataDirSize, _ := getDirSize("/home/system/components/ws/appdata")
partitionUsageSplit := UsageSplit{ if partition.Mountpoint == "/" {
OS: osUsageSplit, edgeappsUsageSplit = edgeappsDirSize + wsAppDataDirSize
EdgeApps: edgeappsUsageSplit, deviceUsageStat.UsageSplit.EdgeApps += edgeappsUsageSplit
Buckets: bucketsUsageSplit, }
Others: othersUsageSplit,
}
deviceUsageStat.Total = deviceUsageStat.Total + s.Total if device.MainDevice {
deviceUsageStat.Used = deviceUsageStat.Used + s.Used osUsageSplit = (s.Used - othersUsageSplit - bucketsUsageSplit - edgeappsUsageSplit)
deviceUsageStat.Free = deviceUsageStat.Free + s.Free } else {
deviceUsageStat.UsageSplit.OS = deviceUsageStat.UsageSplit.OS + osUsageSplit othersUsageSplit = (s.Used - bucketsUsageSplit - edgeappsUsageSplit)
deviceUsageStat.UsageSplit.EdgeApps = deviceUsageStat.UsageSplit.EdgeApps + edgeappsUsageSplit }
deviceUsageStat.UsageSplit.Buckets = deviceUsageStat.UsageSplit.Buckets + bucketsUsageSplit
deviceUsageStat.UsageSplit.Others = deviceUsageStat.UsageSplit.Others + othersUsageSplit partitionUsageSplit := UsageSplit{
OS: osUsageSplit,
EdgeApps: edgeappsUsageSplit,
Buckets: bucketsUsageSplit,
Others: othersUsageSplit,
}
deviceUsageStat.Total = deviceUsageStat.Total + s.Total
deviceUsageStat.Used = deviceUsageStat.Used + s.Used
deviceUsageStat.Free = deviceUsageStat.Free + s.Free
deviceUsageStat.UsageSplit.OS = deviceUsageStat.UsageSplit.OS + osUsageSplit
deviceUsageStat.UsageSplit.EdgeApps = deviceUsageStat.UsageSplit.EdgeApps + edgeappsUsageSplit
deviceUsageStat.UsageSplit.Buckets = deviceUsageStat.UsageSplit.Buckets + bucketsUsageSplit
deviceUsageStat.UsageSplit.Others = deviceUsageStat.UsageSplit.Others + othersUsageSplit
devices[deviceIndex].Partitions[partitionIndex].UsageStat = UsageStat{
Total: s.Total,
Used: s.Used,
Free: s.Free,
Percent: partitionUsagePercent,
UsageSplit: partitionUsageSplit,
}
devices[deviceIndex].Partitions[partitionIndex].UsageStat = UsageStat{
Total: s.Total,
Used: s.Used,
Free: s.Free,
Percent: partitionUsagePercent,
UsageSplit: partitionUsageSplit,
} }
} }

6
internal/tasks/tasks.go
View File

@ -259,9 +259,13 @@ func ExecuteSchedules(tick int) {
} }
if tick%5 == 0 {
// Executing every 5 ticks
log.Println(taskGetStorageDevices())
}
if tick%30 == 0 { if tick%30 == 0 {
// Executing every 30 ticks // Executing every 30 ticks
log.Println(taskGetStorageDevices())
log.Println(taskGetEdgeApps()) log.Println(taskGetEdgeApps())
} }