X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=prosody;h=a2cb0e6cdb09319aa1650d7b51f4597728947aab;hb=6476483abc422694260d7db92bdea1b370c97481;hp=61be6c2e29218d4e16c4bb0949c9c55d72cb0bac;hpb=a14deb1f4521c0dd3a1e062c521ba71c54bafc75;p=prosody.git

diff --git a/prosody b/prosody
index 61be6c2e..a2cb0e6c 100755
--- a/prosody
+++ b/prosody
@@ -43,6 +43,12 @@ if CFG_DATADIR then
 	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;
@@ -372,8 +378,10 @@ function loop()
 		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
-		socket.sleep(0.2);
+		sleep(0.2);
 	end
 end