mod_storage_sql: Log error when failing to update MySQL schema

[prosody.git] / plugins / mod_version.lua

diff --git a/plugins/mod_version.lua b/plugins/mod_version.lua
index a34ce6f26dfc91dda958e3d5202a57c6285855ff..52d8d290dcec84044383e3db1afb9f811c1602cd 100644 (file)
--- a/plugins/mod_version.lua
+++ b/plugins/mod_version.lua
@@ -10,28 +10,35 @@ local st = require "util.stanza";
 
 module:add_feature("jabber:iq:version");
 
-local version = "the best operating system ever!";
+local version;
+
+local query = st.stanza("query", {xmlns = "jabber:iq:version"})
+       :tag("name"):text("Prosody"):up()
+       :tag("version"):text(prosody.version):up();
 
 if not module:get_option("hide_os_type") then
        if os.getenv("WINDIR") then
                version = "Windows";
        else
-               local uname = io.popen(module:get_option("os_version_command") or "uname");
-               if uname then
-                       version = uname:read("*a");
-               else
-                       version = "an OS";
+               local os_version_command = module:get_option("os_version_command");
+               local ok pposix = pcall(require, "pposix");
+               if not os_version_command and (ok and pposix and pposix.uname) then
+                       version = pposix.uname().sysname;
                end
+               if not version then
+                       local uname = io.popen(os_version_command or "uname");
+                       if uname then
+                               version = uname:read("*a");
+                       end
+                       uname:close();
+               end
+       end
+       if version then
+               version = version:match("^%s*(.-)%s*$") or version;
+               query:tag("os"):text(version):up();
        end
 end
 
-version = version:match("^%s*(.-)%s*$") or version;
-
-local query = st.stanza("query", {xmlns = "jabber:iq:version"})
-       :tag("name"):text("Prosody"):up()
-       :tag("version"):text(prosody.version):up()
-       :tag("os"):text(version);
-
 module:hook("iq/host/jabber:iq:version:query", function(event)
        local stanza = event.stanza;
        if stanza.attr.type == "get" and stanza.attr.to == module.host then