Software / code / prosody
Comparison
prosodyctl @ 1125:ad7c1cefb8eb
Merge with 0.4
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 05 May 2009 16:41:17 +0100 |
| parent | 1124:055cfdc96afa |
| child | 1205:23a079f50cab |
comparison
equal
deleted
inserted
replaced
| 1121:063036ac82b7 | 1125:ad7c1cefb8eb |
|---|---|
| 90 local error_messages = setmetatable({ | 90 local error_messages = setmetatable({ |
| 91 ["invalid-username"] = "The given username is invalid in a Jabber ID"; | 91 ["invalid-username"] = "The given username is invalid in a Jabber ID"; |
| 92 ["invalid-hostname"] = "The given hostname is invalid"; | 92 ["invalid-hostname"] = "The given hostname is invalid"; |
| 93 ["no-password"] = "No password was supplied"; | 93 ["no-password"] = "No password was supplied"; |
| 94 ["no-such-user"] = "The given user does not exist on the server"; | 94 ["no-such-user"] = "The given user does not exist on the server"; |
| 95 ["unable-to-save-data"] = "Unable to store, perhaps you don't have permission?"; | |
| 95 }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end }); | 96 }, { __index = function (t,k) return "Error: "..(tostring(k):gsub("%-", " "):gsub("^.", string.upper)); end }); |
| 96 | 97 |
| 97 hosts = {}; | 98 hosts = {}; |
| 98 | 99 |
| 99 require "core.hostmanager" | 100 require "core.hostmanager" |
| 316 show_message("Prosody is running with PID %s", ret or "(unknown)"); | 317 show_message("Prosody is running with PID %s", ret or "(unknown)"); |
| 317 return 0; | 318 return 0; |
| 318 else | 319 else |
| 319 show_message("Prosody is not running"); | 320 show_message("Prosody is not running"); |
| 320 if not switched_user and current_uid ~= 0 then | 321 if not switched_user and current_uid ~= 0 then |
| 321 print("\nNote: You will also see this if prosodyctl is not running under the same"); | 322 print("\nNote:") |
| 322 print(" user account as Prosody. Try running as root (e.g. with 'sudo' in front) to"); | 323 print(" You will also see this if prosodyctl is not running under"); |
| 323 print(" gain access to Prosody's real status."); | 324 print(" the same user account as Prosody. Try running as root (e.g. "); |
| 325 print(" with 'sudo' in front) to gain access to Prosody's real status."); | |
| 324 end | 326 end |
| 325 return 2 | 327 return 2 |
| 326 end | 328 end |
| 327 return 1; | 329 return 1; |
| 328 end | 330 end |