Skip to content

Commit 2a09dae

Browse files
committed
fix(module_manager): refactor to use empty settings when merge settings failed
1 parent 3fafd33 commit 2a09dae

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

shard.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ shards:
77

88
action-controller:
99
git: https://github.com/spider-gazelle/action-controller.git
10-
version: 7.4.3
10+
version: 7.4.4
1111

1212
active-model:
1313
git: https://github.com/spider-gazelle/active-model.git
@@ -191,7 +191,7 @@ shards:
191191

192192
placeos-driver:
193193
git: https://github.com/placeos/driver.git
194-
version: 7.2.16
194+
version: 7.2.18
195195

196196
placeos-log-backend:
197197
git: https://github.com/place-labs/log-backend.git
@@ -259,7 +259,7 @@ shards:
259259

260260
ssh2:
261261
git: https://github.com/spider-gazelle/ssh2.cr.git
262-
version: 1.6.1
262+
version: 1.7.0
263263

264264
tasker:
265265
git: https://github.com/spider-gazelle/tasker.git

src/placeos-core/module_manager.cr

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,8 @@ module PlaceOS::Core
412412
# Merge module settings
413413
merged_settings = mod.merge_settings
414414
rescue e
415-
raise ModuleError.new("Failed to merge module settings #{e.message}")
415+
merged_settings = "{}".to_json
416+
Log.error(exception: e) { {message: "Failed to merge module settings", module_id: mod.id, name: mod.name, custom_name: mod.custom_name} }
416417
end
417418

418419
# Start format

0 commit comments

Comments
 (0)