projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_admin_telnet: c2s:count in less lines
[prosody.git]
/
prosody
diff --git
a/prosody
b/prosody
index 61be6c2e29218d4e16c4bb0949c9c55d72cb0bac..a2cb0e6cdb09319aa1650d7b51f4597728947aab 100755
(executable)
--- a/
prosody
+++ b/
prosody
@@
-43,6
+43,12
@@
if CFG_DATADIR then
end
end
end
end
+if #arg > 0 and arg[1] ~= "--config" then
+ print("Unknown command-line option: "..tostring(arg[1]));
+ print("Perhaps you meant to use prosodyctl instead?");
+ return 1;
+end
+
-- Global 'prosody' object
local prosody = { events = require "util.events".new(); };
_G.prosody = prosody;
-- Global 'prosody' object
local prosody = { events = require "util.events".new(); };
_G.prosody = prosody;
@@
-372,8
+378,10
@@
function loop()
prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback});
end
prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback});
end
+ local sleep = require"socket".sleep;
+
while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
- s
ocket.s
leep(0.2);
+ sleep(0.2);
end
end
end
end