wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error handling

Browse Source
This commit is contained in:
Zach Copley 2009-09-02 00:50:41 +00:00
parent 8b040eba40
commit f86fed357c
1 changed files with 42 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
lib/twitter.php
View File

@ -175,34 +175,7 @@ function broadcast_oauth($notice, $flink) {
try { try {
$status = $client->statusesUpdate($statustxt); $status = $client->statusesUpdate($statustxt);
} catch (OAuthClientCurlException $e) { } catch (OAuthClientCurlException $e) {
return process_error($e, $flink);
if ($e->getMessage() == 'The requested URL returned error: 401') {
$errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
'Twitter OAuth access token.',
$user->nickname, $user->id);
common_log(LOG_WARNING, $errmsg);
// Bad auth token! We need to delete the foreign_link
// to Twitter and inform the user.
remove_twitter_link($flink);
return true;
} else {
// Some other error happened, so we should probably
// try to send again later.
$errmsg = sprintf('cURL error trying to send notice to Twitter ' .
'for user %1$s (user id: %2$s) - ' .
'code: %3$s message: %4$s.',
$user->nickname, $user->id,
$e->getCode(), $e->getMessage());
common_log(LOG_WARNING, $errmsg);
return false;
}
} }
if (empty($status)) { if (empty($status)) {
@ -210,9 +183,9 @@ function broadcast_oauth($notice, $flink) {
// This could represent a failure posting, // This could represent a failure posting,
// or the Twitter API might just be behaving flakey. // or the Twitter API might just be behaving flakey.
$errmsg = sprintf('No data returned by Twitter API when ' . $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
'trying to send update for %1$s (user id %2$s).', 'trying to send update for %1$s (user id %2$s).',
$user->nickname, $user->id); $user->nickname, $user->id);
common_log(LOG_WARNING, $errmsg); common_log(LOG_WARNING, $errmsg);
return false; return false;
@ -220,7 +193,7 @@ function broadcast_oauth($notice, $flink) {
// Notice crossed the great divide // Notice crossed the great divide
$msg = sprintf('Twitter bridge posted notice %s to Twitter using OAuth.', $msg = sprintf('Twitter bridge - posted notice %s to Twitter using OAuth.',
$notice->id); $notice->id);
common_log(LOG_INFO, $msg); common_log(LOG_INFO, $msg);
@ -239,46 +212,57 @@ function broadcast_basicauth($notice, $flink)
try { try {
$status = $client->statusesUpdate($statustxt); $status = $client->statusesUpdate($statustxt);
} catch (BasicAuthCurlException $e) { } catch (BasicAuthCurlException $e) {
return process_error($e, $flink);
if ($e->getMessage() == 'The requested URL returned error: 401') {
$errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
'Twitter screen_name/password combo.',
$user->nickname, $user->id);
common_log(LOG_WARNING, $errmsg);
remove_twitter_link($flink);
return true;
} else {
$errmsg = sprintf('cURL error trying to send notice to Twitter ' .
'for user %1$s (user id: %2$s) - ' .
'code: %3$s message: %4$s.',
$user->nickname, $user->id,
$e->getCode(), $e->getMessage());
common_log(LOG_WARNING, $errmsg);
return false;
}
} }
if (empty($status)) { if (empty($status)) {
$errmsg = sprintf('No data returned by Twitter API when ' . $errmsg = sprintf('Twitter bridge - No data returned by Twitter API when ' .
'trying to send update for %1$s (user id %2$s).', 'trying to send update for %1$s (user id %2$s).',
$user->nickname, $user->id); $user->nickname, $user->id);
common_log(LOG_WARNING, $errmsg); common_log(LOG_WARNING, $errmsg);
return false; return false;
} }
$msg = sprintf('Twitter bridge posted notice %s to Twitter using basic auth.', $msg = sprintf('Twitter bridge - posted notice %s to Twitter using basic auth.',
$notice->id); $notice->id);
common_log(LOG_INFO, $msg); common_log(LOG_INFO, $msg);
return true; return true;
}
function process_error($e, $flink)
{
$user = $flink->getUser();
$errmsg = $e->getMessage();
$delivered = false;
switch($errmsg) {
case 'The requested URL returned error: 401':
$logmsg = sprintf('Twiter bridge - User %1$s (user id: %2$s) has an invalid ' .
'Twitter screen_name/password combo or an invalid acesss token.',
$user->nickname, $user->id);
$delivered = true;
remove_twitter_link($flink);
break;
case 'The requested URL returned error: 403':
$logmsg = sprintf('Twitter bridge - User %1$s (user id: %2$s) has exceeded ' .
'his/her Twitter request limit.',
$user->nickname, $user->id);
break;
default:
$logmsg = sprintf('Twitter bridge - cURL error trying to send notice to Twitter ' .
'for user %1$s (user id: %2$s) - ' .
'code: %3$s message: %4$s.',
$user->nickname, $user->id,
$e->getCode(), $e->getMessage());
break;
}
common_log(LOG_WARNING, $logmsg);
return $delivered;
} }
function format_status($notice) function format_status($notice)