Software / code / prosody
Comparison
core/storagemanager.lua @ 7950:f91e7ec9654e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 06 Mar 2017 01:14:32 +0100 |
| parent | 7647:e9d7a409e236 |
| parent | 7947:24170d74b00b |
| child | 7999:980606856882 |
comparison
equal
deleted
inserted
replaced
| 7946:c92102fe409b | 7950:f91e7ec9654e |
|---|---|
| 70 found_sql2 = true; | 70 found_sql2 = true; |
| 71 end | 71 end |
| 72 end | 72 end |
| 73 end | 73 end |
| 74 if found_sql2 then | 74 if found_sql2 then |
| 75 log("error", "The temporary 'sql2' storage module has now been renamed to 'sql', please update your config file: https://prosody.im/doc/modules/mod_storage_sql2"); | 75 log("error", "The temporary 'sql2' storage module has now been renamed to 'sql', " |
| 76 .."please update your config file: https://prosody.im/doc/modules/mod_storage_sql2"); | |
| 76 end | 77 end |
| 77 return storage_config; | 78 return storage_config; |
| 78 end | 79 end |
| 79 | 80 |
| 80 local function get_driver(host, store) | 81 local function get_driver(host, store) |
| 178 if not purged[driver_name] then | 179 if not purged[driver_name] then |
| 179 local driver = get_driver(host, store); | 180 local driver = get_driver(host, store); |
| 180 if driver.purge then | 181 if driver.purge then |
| 181 purged[driver_name] = driver:purge(user); | 182 purged[driver_name] = driver:purge(user); |
| 182 else | 183 else |
| 183 log("warn", "Storage driver %s does not support removing all user data, you may need to delete it manually", driver_name); | 184 log("warn", "Storage driver %s does not support removing all user data, " |
| 185 .."you may need to delete it manually", driver_name); | |
| 184 end | 186 end |
| 185 end | 187 end |
| 186 end | 188 end |
| 187 end | 189 end |
| 188 get_driver(host):purge(user); -- and the default driver | 190 get_driver(host):purge(user); -- and the default driver |