github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(storage): delete storage fails if a panic occurred during initialization (#7501) 

* fix(storage): store storages map when init storage panic

* fix(drivers): add nil check to drop method
pull/7204/merge
Jason-Fly 2024-11-16 13:20:49 +08:00 committed by GitHub
parent c3c5843dce
commit 1c01dc6839
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/chaoxing/driver.go
View File

@ -67,7 +67,9 @@ func (d *ChaoXing) Init(ctx context.Context) error {
} }
func (d *ChaoXing) Drop(ctx context.Context) error { func (d *ChaoXing) Drop(ctx context.Context) error {
d.cron.Stop() if d.cron != nil {
d.cron.Stop()
}
return nil return nil
} }

4
drivers/vtencent/drive.go
View File

@ -55,7 +55,9 @@ func (d *Vtencent) Init(ctx context.Context) error {
} }
func (d *Vtencent) Drop(ctx context.Context) error { func (d *Vtencent) Drop(ctx context.Context) error {
d.cron.Stop() if d.cron != nil {
d.cron.Stop()
}
return nil return nil
} }

2
internal/op/storage.go
View File

@ -101,7 +101,7 @@ func initStorage(ctx context.Context, storage model.Storage, storageDriver drive
log.Errorf("panic init storage: %s", errInfo) log.Errorf("panic init storage: %s", errInfo)
driverStorage.SetStatus(errInfo) driverStorage.SetStatus(errInfo)
MustSaveDriverStorage(storageDriver) MustSaveDriverStorage(storageDriver)
storagesMap.Delete(driverStorage.MountPath) storagesMap.Store(driverStorage.MountPath, storageDriver)
} }
}() }()
// Unmarshal Addition // Unmarshal Addition