summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-09-13 12:11:07 -0400
committerEvan Prodromou <evan@prodromou.name>2008-09-13 12:11:07 -0400
commited57778b92e03d1e1dc922273eb07bd929398cbd (patch)
tree15597a56cb9e929ea1f604681b0b22fdba30a157
parenta482123feaf4ce90d24326067b4e75445b3dfeaa (diff)
LOG_ERROR -> LOG_ERR
darcs-hash:20080913161107-84dde-30b694455d509a7ec2d12e8418f54ce695aa0993.gz
-rw-r--r--lib/xmppqueuehandler.php4
-rwxr-xr-xscripts/jabberqueuehandler.php2
-rwxr-xr-xscripts/publicqueuehandler.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/xmppqueuehandler.php b/lib/xmppqueuehandler.php
index ce82c9a46..8e0db6f31 100644
--- a/lib/xmppqueuehandler.php
+++ b/lib/xmppqueuehandler.php
@@ -53,8 +53,8 @@ class XmppQueueHandler extends QueueHandler {
try {
$this->conn->processTime($timeout);
} catch (XMPPHP_Exception $e) {
- $this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
- exit(1);
+ $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ die($e->getMessage());
}
}
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index 24f818a0c..59cdb94ad 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -45,7 +45,7 @@ class JabberQueueHandler extends XmppQueueHandler {
try {
return jabber_broadcast_notice($notice);
} catch (XMPPHP_Exception $e) {
- $this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
exit(1);
}
}
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index dde6a3427..b1ae1d581 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -43,8 +43,8 @@ class PublicQueueHandler extends XmppQueueHandler {
try {
return jabber_public_notice($notice);
} catch (XMPPHP_Exception $e) {
- $this->log(LOG_ERROR, "Got an XMPPHP_Exception: " . $e->getMessage());
- exit(1);
+ $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+ die($e->getMessage());
}
}
}