aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2011-07-20 16:15:03 +0100
committerPatrick J Cherry <patrick@bytemark.co.uk>2011-07-20 16:15:03 +0100
commit645c47d975e3c34a092acddf4a5f9420010755bc (patch)
tree6c667f44b01425efe6e7e4e10813bfe0cc082632 /bin
parent53f89ba450850990057883a92f89ed994563e4ab (diff)
* Added heartbeat to remote mauve
* Added URLs to messages * Added example configuration file * Added various docs * XMPP messages now XHTML and TXT * Handling of MUC reconnection a bit better.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/mauvesend2
-rwxr-xr-xbin/mauveserver7
2 files changed, 8 insertions, 1 deletions
diff --git a/bin/mauvesend b/bin/mauvesend
index 7b1375f..42229eb 100755
--- a/bin/mauvesend
+++ b/bin/mauvesend
@@ -163,7 +163,7 @@ require 'getoptlong'
begin
require "mauve/#{r}"
rescue LoadError => ex
- puts ex.to_s
+ STDERR.puts "*** "+ex.to_s
end
end
diff --git a/bin/mauveserver b/bin/mauveserver
index d07aabb..4cb37ed 100755
--- a/bin/mauveserver
+++ b/bin/mauveserver
@@ -16,6 +16,12 @@
# specified, then mauvealert.conf in the current
# directory is used, and failing that
# /etc/mauvealert/mauvealert.conf is used.
+#
+# CONFIGURATION FILE
+#
+# The configuration file consists of various stanzas, and sub-stanzas which
+# give give options for each part of the server. The example configuration
+# file gives a definitive explanation of all the options.
#
# SEE ALSO
# mauveclient(1), mauveconsole(1)
@@ -88,6 +94,7 @@ require 'mauve/configuration'
begin
Mauve::Configuration.current = Mauve::ConfigurationBuilder.load(configuration_file)
rescue StandardError => ex
+ STDERR.puts ex.backtrace.join("\n")
error ex.message
end