From 5d7c5ba1203d7714a5d4e1f02c3050cfd13482eb Mon Sep 17 00:00:00 2001 From: link Date: Wed, 15 Jun 2022 10:22:27 +0800 Subject: [PATCH] Dev (#296) * fix bug * updata UI * 0.3.2 ### Added - [Files] Files can now be selected multiple files and downloaded, deleted, moved, etc. - [Apps] Support to modify the application opening address.([#204](https://github.com/IceWhaleTech/CasaOS/issues/204)) ### Changed - [Apps] Hide the display of non-essential environment variables in the application. - [System] Network, disk, cpu, memory, etc. information is modified to be pushed via socket. - [System] Optimize opening speed.([#214](https://github.com/IceWhaleTech/CasaOS/issues/214)) ### Fixed - [System] Fixed the problem that sync data cannot submit the device ID ([#68](https://github.com/IceWhaleTech/CasaOS/issues/68)) - [Files] Fixed the code editor center alignment display problem.([#210](https://github.com/IceWhaleTech/CasaOS/issues/210)) - [Files] Fixed the problem of wrong name when downloading files.([#240](https://github.com/IceWhaleTech/CasaOS/issues/240)) - [System] Fixed the network display as a negative number problem.([#224](https://github.com/IceWhaleTech/CasaOS/issues/224)) * Modify log help class * Fix some bugs in 0.3.2 * Solve the operation file queue problem * Exclude web folders * update UI * add cancel file operate * Update UI * Merge sockets to transfer data * Conflict Resolution * Update send data interval * Update UI * fixed bug - Fix the problem of application opening failure on non-80 ports - Modify port failure problem - Modify environment variables disappearing problem * update version function * Fix version update issues * fixed bug - [System] Fixed the issue of widgets displaying wrongly on mobile devices. - [App] Fix the problem of application opening failure on non-80 ports ([#283](https://github.com/IceWhaleTech/CasaOS/issues/283) [#280](https://github.com/IceWhaleTech/CasaOS/issues/280)) - [System] Modify port failure problem ([#282](https://github.com/IceWhaleTech/CasaOS/issues/282)) - [App]Modify environment variables disappearing problem([#284](https://github.com/IceWhaleTech/CasaOS/issues/284)) - [System]Fix no update alert([#278](https://github.com/IceWhaleTech/CasaOS/issues/278)) - [System] Fixed some bugs of application cpu usage and memory staging([#272]https://github.com/IceWhaleTech/CasaOS/issues/272) * update UI * Update CHANGELOG.md * update app service * update ui --- service/app.go | 6 +++++- web/index.html | 2 +- web/js/8.js | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/service/app.go b/service/app.go index 4ed9728..b08bcc8 100644 --- a/service/app.go +++ b/service/app.go @@ -464,7 +464,7 @@ func (a *appStruct) GetHardwareUsageSteam() { fts := filters.NewArgs() fts.Add("label", "casaos=casaos") - fts.Add("status", "running") + //fts.Add("status", "running") for i := 0; i < 100; i++ { if config.CasaOSGlobalVariables.AppChange { @@ -481,6 +481,10 @@ func (a *appStruct) GetHardwareUsageSteam() { } var wg sync.WaitGroup for _, v := range containers { + if v.State != "running" { + dataStats.Delete(v.ID) + continue + } wg.Add(1) go func(v types.Container, i int) { defer wg.Done() diff --git a/web/index.html b/web/index.html index fc39518..395f8b2 100644 --- a/web/index.html +++ b/web/index.html @@ -20,7 +20,7 @@ CasaOS - +