beenull/CasaOS
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #50 from IceWhaleTech/dev

Browse source 
update stats steam
This commit is contained in:
link 2021-12-10 16:34:29 +08:00 committed by GitHub
parent 4c1cbc98a4 9a900b2ca0
commit 61b824065b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
service/app.go
View file

@ -300,7 +300,6 @@ func (a *appStruct) GetHardwareUsageSteam() {
var lm []model2.AppListDBModel var lm []model2.AppListDBModel
a.db.Table(model2.CONTAINERTABLENAME).Select("label,title,icon,container_id").Where("origin != ?", "system").Find(&lm) a.db.Table(model2.CONTAINERTABLENAME).Select("label,title,icon,container_id").Where("origin != ?", "system").Find(&lm)
var list []types.ContainerStats
for i := 0; i < 100; i++ { for i := 0; i < 100; i++ {
if config.CasaOSGlobalVariables.AppChange { if config.CasaOSGlobalVariables.AppChange {
lm = []model2.AppListDBModel{} lm = []model2.AppListDBModel{}
@ -319,7 +318,7 @@ func (a *appStruct) GetHardwareUsageSteam() {
var wg sync.WaitGroup var wg sync.WaitGroup
for _, v := range lm { for _, v := range lm {
wg.Add(1) wg.Add(1)
go func(v model2.AppListDBModel, lock *sync.Mutex) { go func(v model2.AppListDBModel, lock *sync.Mutex, i int) {
defer wg.Done() defer wg.Done()
stats, err := cli.ContainerStats(ctx, v.ContainerId, true) stats, err := cli.ContainerStats(ctx, v.ContainerId, true)
if err != nil { if err != nil {
@ -342,28 +341,19 @@ func (a *appStruct) GetHardwareUsageSteam() {
} }
dataStr[v.ContainerId] = dockerStats dataStr[v.ContainerId] = dockerStats
lock.Unlock() lock.Unlock()
}(v, lock) if i == 99 {
stats.Body.Close()
}
}(v, lock, i)
} }
wg.Wait() wg.Wait()
isFinish = true isFinish = true
if i == 99 { time.Sleep(time.Second * 3)
for _, v := range list {
v.Body.Close()
}
}
time.Sleep(time.Second * 2)
} }
isFinish = false isFinish = false
cancel() cancel()
} }
// init install
func Init() {
}
func NewAppService(db *gorm.DB, logger loger2.OLog) AppService { func NewAppService(db *gorm.DB, logger loger2.OLog) AppService {
Init()
return &appStruct{db: db, log: logger} return &appStruct{db: db, log: logger}
} }