LOG_ERROR -> LOG_ERR

darcs-hash:20080718190835-84dde-1ce20cb3ac604f0e9fa9e4ed86118bca7bec3a06.gz

diff --git a/lib/mail.php b/lib/mail.php
index f01f88e014875502c434b1b234b33a4f32f0c7b6..f852f385a3d3a357dad22440b1c74fa7af2fbabe 100644 (file)
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -42,7 +42,7 @@ function mail_send($recipients, $headers, $body) {
        assert($backend); # throws an error if it's bad
        $sent = $backend->send($recipients, $headers, $body);
        if (PEAR::isError($sent)) {
-               common_log(LOG_ERROR, 'Email error: ' . $sent->getMessage());
+               common_log(LOG_ERR, 'Email error: ' . $sent->getMessage());
                return false;
        }
        return true;

diff --git a/lib/util.php b/lib/util.php
index 5e3e8c98d0e1b8f1e64538e37f2f84a91a41ffbf..c2c4f99db5986ad5f4fc7e38943bbff501e5f9b2 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -921,7 +921,7 @@ function common_save_replies($notice) {
                $id = $reply->insert();
                if (!$id) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       common_log(LOG_ERROR, 'DB error inserting reply: ' . $last_error->message);
+                       common_log(LOG_ERR, 'DB error inserting reply: ' . $last_error->message);
                        common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
                        return;
                }
@@ -946,7 +946,7 @@ function common_enqueue_notice($notice) {
         $result = $qi->insert();
        if (!$result) {
            $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-           common_log(LOG_ERROR, 'DB error inserting queue item: ' . $last_error->message);
+           common_log(LOG_ERR, 'DB error inserting queue item: ' . $last_error->message);
            return false;
        }
        common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id);
@@ -960,14 +960,14 @@ function common_real_broadcast($notice, $remote=false) {
                require_once(INSTALLDIR.'/lib/omb.php');
                $success = omb_broadcast_remote_subscribers($notice);
                if (!$success) {
-                       common_log(LOG_ERROR, 'Error in OMB broadcast for notice ' . $notice->id);
+                       common_log(LOG_ERR, 'Error in OMB broadcast for notice ' . $notice->id);
                }
        }
        if ($success) {
                require_once(INSTALLDIR.'/lib/jabber.php');
                $success = jabber_broadcast_notice($notice);
                if (!$success) {
-                       common_log(LOG_ERROR, 'Error in jabber broadcast for notice ' . $notice->id);
+                       common_log(LOG_ERR, 'Error in jabber broadcast for notice ' . $notice->id);
                }
        }
        // XXX: broadcast notices to SMS

diff --git a/xmppdaemon.php b/xmppdaemon.php
index e772ecc0895322a640c6d1ec4118e9767ff17d73..9389e6fc9d8433f5af817f27f7ea4a3d8beb775d 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -212,7 +212,7 @@ class XMPPDaemon {
                $result = $user->update($orig);
                if (!$id) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not set notify flag to ' . $notify .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -232,7 +232,7 @@ class XMPPDaemon {
                $id = $notice->insert();
                if (!$id) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not insert ' . common_log_objstring($notice) .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -243,7 +243,7 @@ class XMPPDaemon {
                $result = $notice->update($orig);
                if (!$result) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
-                       $this->log(LOG_ERROR,
+                       $this->log(LOG_ERR,
                                           'Could not add URI to ' . common_log_objstring($notice) .
                                           ' for user ' . common_log_objstring($user) .
                                           ': ' . $last_error->message);
@@ -388,7 +388,7 @@ class XMPPDaemon {
                                                                  $user->nickname,
                                                                  $confirm->address);
                                if (!$success) {
-                                       $this->log(LOG_ERROR, 'Confirmation failed for ' . $confirm->address);
+                                       $this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
                                        # Just let the claim age out; hopefully things work then
                                        continue;
                                } else {
@@ -398,7 +398,7 @@ class XMPPDaemon {
                                        $confirm->sent = $confirm->claimed;
                                        $result = $confirm->update($original);
                                        if (!$result) {
-                                               $this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
+                                               $this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
                                                # Just let the claim age out; hopefully things work then
                                                continue;
                                        }