Software /
code /
prosody
Comparison
core/storagemanager.lua @ 3893:475fc383527d
storagemanager: Don't always show fallback warning when using per-store config
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Sat, 18 Dec 2010 14:44:45 +0000 |
parent | 3889:2ef3d10e107b |
child | 4009:71b2c1dcf26d |
comparison
equal
deleted
inserted
replaced
3892:070d04b56a48 | 3893:475fc383527d |
---|---|
69 local driver = load_driver(host, driver_name); | 69 local driver = load_driver(host, driver_name); |
70 if not driver then | 70 if not driver then |
71 driver_name = config.get(host, "core", "default_storage"); | 71 driver_name = config.get(host, "core", "default_storage"); |
72 driver = load_driver(host, driver_name); | 72 driver = load_driver(host, driver_name); |
73 if not driver then | 73 if not driver then |
74 if storage or driver_name then | 74 if driver_name or (type(storage) == "string" |
75 or type(storage) == "table" and storage[store]) then | |
75 log("warn", "Falling back to default driver for %s storage on %s", store, host); | 76 log("warn", "Falling back to default driver for %s storage on %s", store, host); |
76 end | 77 end |
77 driver_name = "internal"; | 78 driver_name = "internal"; |
78 driver = load_driver(host, driver_name); | 79 driver = load_driver(host, driver_name); |
79 end | 80 end |