GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

LOG_ERROR -> LOG_ERR 

darcs-hash:20080718190835-84dde-1ce20cb3ac604f0e9fa9e4ed86118bca7bec3a06.gz
This commit is contained in:
Evan Prodromou 2008-07-18 15:08:35 -04:00
parent cebbff432a
commit 54a931a31a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mail.php
View File

@ -42,7 +42,7 @@ function mail_send($recipients, $headers, $body) {
assert($backend); # throws an error if it's bad assert($backend); # throws an error if it's bad
$sent = $backend->send($recipients, $headers, $body); $sent = $backend->send($recipients, $headers, $body);
if (PEAR::isError($sent)) { if (PEAR::isError($sent)) {
common_log(LOG_ERROR, 'Email error: ' . $sent->getMessage()); common_log(LOG_ERR, 'Email error: ' . $sent->getMessage());
return false; return false;
} }
return true; return true;

8
lib/util.php
View File

@ -921,7 +921,7 @@ function common_save_replies($notice) {
$id = $reply->insert(); $id = $reply->insert();
if (!$id) { if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $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)); common_server_error(sprintf(_('DB error inserting reply: %s'), $last_error->message));
return; return;
} }
@ -946,7 +946,7 @@ function common_enqueue_notice($notice) {
$result = $qi->insert(); $result = $qi->insert();
if (!$result) { if (!$result) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $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; return false;
} }
common_log(LOG_DEBUG, 'complete queueing notice ID = ' . $notice->id); 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'); require_once(INSTALLDIR.'/lib/omb.php');
$success = omb_broadcast_remote_subscribers($notice); $success = omb_broadcast_remote_subscribers($notice);
if (!$success) { 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) { if ($success) {
require_once(INSTALLDIR.'/lib/jabber.php'); require_once(INSTALLDIR.'/lib/jabber.php');
$success = jabber_broadcast_notice($notice); $success = jabber_broadcast_notice($notice);
if (!$success) { 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 // XXX: broadcast notices to SMS

10
xmppdaemon.php
View File

@ -212,7 +212,7 @@ class XMPPDaemon {
$result = $user->update($orig); $result = $user->update($orig);
if (!$id) { if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
$this->log(LOG_ERROR, $this->log(LOG_ERR,
'Could not set notify flag to ' . $notify . 'Could not set notify flag to ' . $notify .
' for user ' . common_log_objstring($user) . ' for user ' . common_log_objstring($user) .
': ' . $last_error->message); ': ' . $last_error->message);
@ -232,7 +232,7 @@ class XMPPDaemon {
$id = $notice->insert(); $id = $notice->insert();
if (!$id) { if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
$this->log(LOG_ERROR, $this->log(LOG_ERR,
'Could not insert ' . common_log_objstring($notice) . 'Could not insert ' . common_log_objstring($notice) .
' for user ' . common_log_objstring($user) . ' for user ' . common_log_objstring($user) .
': ' . $last_error->message); ': ' . $last_error->message);
@ -243,7 +243,7 @@ class XMPPDaemon {
$result = $notice->update($orig); $result = $notice->update($orig);
if (!$result) { if (!$result) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError'); $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
$this->log(LOG_ERROR, $this->log(LOG_ERR,
'Could not add URI to ' . common_log_objstring($notice) . 'Could not add URI to ' . common_log_objstring($notice) .
' for user ' . common_log_objstring($user) . ' for user ' . common_log_objstring($user) .
': ' . $last_error->message); ': ' . $last_error->message);
@ -388,7 +388,7 @@ class XMPPDaemon {
$user->nickname, $user->nickname,
$confirm->address); $confirm->address);
if (!$success) { 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 # Just let the claim age out; hopefully things work then
continue; continue;
} else { } else {
@ -398,7 +398,7 @@ class XMPPDaemon {
$confirm->sent = $confirm->claimed; $confirm->sent = $confirm->claimed;
$result = $confirm->update($original); $result = $confirm->update($original);
if (!$result) { 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 # Just let the claim age out; hopefully things work then
continue; continue;
} }