Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(storage): roll back configuration when provider reload fails

Timothy Yin61d985774d47
diff --git a/server/services/settings/settingsManager.ts b/server/services/settings/settingsManager.ts
index 07846f11..6f1a4f14 100644
--- a/server/services/settings/settingsManager.ts
+++ b/server/services/settings/settingsManager.ts
@@ -362,13 +362,12 @@ export class SettingsManager {
newProvider.config,
loggerModule.logger.dynamic('storage'),
)
- setGlobalStorageManager(storageManager)
-
if (newProvider.config.provider === 'local') {
const fs = await import('node:fs/promises')
await fs.mkdir(newProvider.config.basePath, { recursive: true })
}
+ setGlobalStorageManager(storageManager)
this._logger.info('Storage manager bootstrap completed')
return
} catch (bootstrapError) {
@@ -498,6 +497,17 @@ export class SettingsManager {
providerConfig: Partial<NewSettingStorageProvider>,
): Promise<void> {
const db = useDB()
+ const reloadActiveProvider =
+ !settingsManager.isInitializing_() &&
+ (await settingsManager.get<number>('storage', 'provider')) === id
+ const previousProvider = reloadActiveProvider
+ ? await this.getProviderById(id)
+ : null
+
+ if (reloadActiveProvider && !previousProvider) {
+ throw new Error(`Provider with ID ${id} not found`)
+ }
+
db.update(tables.settings_storage_providers)
.set({
...providerConfig,
@@ -507,11 +517,22 @@ export class SettingsManager {
// Rebuild the active instance before saving completes so subsequent
// requests use the updated configuration, including client credentials.
- if (
- !settingsManager.isInitializing_() &&
- (await settingsManager.get<number>('storage', 'provider')) === id
- ) {
- await settingsManager.triggerStorageProviderSwitch(id)
+ if (previousProvider) {
+ try {
+ await settingsManager.triggerStorageProviderSwitch(id)
+ } catch (error) {
+ // Provider construction leaves the existing instance untouched on
+ // failure; restore its persisted configuration to match.
+ db.update(tables.settings_storage_providers)
+ .set({
+ name: previousProvider.name,
+ provider: previousProvider.provider,
+ config: previousProvider.config,
+ })
+ .where(eq(tables.settings_storage_providers.id, id))
+ .run()
+ throw error
+ }
}
},