Software / code / prosody
Changeset
8068:5abb6bc45edd
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Apr 2017 01:25:58 +0200 |
| parents | 8065:36d9c1226fbc (current diff) 8067:91550b6f93d2 (diff) |
| children | 8074:4b403f881176 |
| files | prosodyctl tools/migration/migrator/prosody_sql.lua |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Sat Apr 08 00:48:15 2017 +0200 +++ b/prosodyctl Sun Apr 09 01:25:58 2017 +0200 @@ -973,6 +973,13 @@ print(" For more information see https://prosody.im/doc/storage"); end end + for host, config in pairs(config) do + if type(rawget(config, "storage")) == "string" and rawget(config, "default_storage") then + print(""); + print(" The 'default_storage' option is not needed if 'storage' is set to a string."); + break; + end + end local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty(); local ssl = dependencies.softreq"ssl"; if not ssl then
--- a/tools/migration/migrator/prosody_sql.lua Sat Apr 08 00:48:15 2017 +0200 +++ b/tools/migration/migrator/prosody_sql.lua Sun Apr 09 01:25:58 2017 +0200 @@ -161,7 +161,7 @@ local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)"; return function(item) - if not item then return end -- end of input + if not item then assert(engine.conn:commit()) return end -- end of input local host = item.host or ""; local user = item.user or ""; for store, data in pairs(item.stores) do
