summaryrefslogtreecommitdiff
path: root/scripts/xmppdaemon.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-28 16:38:59 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-06-28 16:38:59 -0400
commit25c721f6ffc5ecf5825b60ab7b9c021d78b50888 (patch)
tree61a7ad929df0d5cb0cb4c8d9204b5c244bf3f23d /scripts/xmppdaemon.php
parent9f079764aa945e9e126ffa41cece17bc8951fb78 (diff)
if not in daemon mode, xmppdaemon sends log to stdout
Diffstat (limited to 'scripts/xmppdaemon.php')
-rwxr-xr-xscripts/xmppdaemon.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 608cc1a36..3e46c8e26 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -309,7 +309,14 @@ class XMPPDaemon extends Daemon
function log($level, $msg)
{
- common_log($level, 'XMPPDaemon('.$this->resource.'): '.$msg);
+ $text = 'XMPPDaemon('.$this->resource.'): '.$msg;
+ common_log($level, $text);
+ if (!$this->daemonize)
+ {
+ $line = common_log_line($level, $text);
+ echo $line;
+ echo "\n";
+ }
}
function subscribed($to)