prosody
b08a46cf06e6%3Ad1ddfc4709ce

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

4479:d1ddfc4709ce

Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 18 Jan 2012 15:08:05 +0000
parents 4478:3e33b2d2e48e (diff) 4474:b08a46cf06e6 (current diff)
children 4480:187ce118aea6
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_tls.lua	Wed Jan 18 08:54:26 2012 +0500
+++ b/plugins/mod_tls.lua	Wed Jan 18 15:08:05 2012 +0000
@@ -75,7 +75,7 @@
 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
 	module:log("debug", "Received features element");
 	if can_do_tls(session) and stanza:child_with_ns(xmlns_starttls) then
-		module:log("%s is offering TLS, taking up the offer...", session.to_host);
+		module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host);
 		session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
 		return true;
 	end
--- a/prosodyctl	Wed Jan 18 08:54:26 2012 +0500
+++ b/prosodyctl	Wed Jan 18 15:08:05 2012 +0000
@@ -540,7 +540,7 @@
 
 function commands.reload(arg)
 	if arg[1] == "--help" then
-		show_usage([[reload]], [[Reload prosody configuration file]]);
+		show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
 		return 1;
 	end