Merge 0.10->trunk

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 61be6c2e29218d4e16c4bb0949c9c55d72cb0bac..47998583168463b238f6998e038f3a544e18c99b 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -372,8 +372,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