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

ping handler returns proper boolean response

Browse Source 
The ping queue handler wasn't returning a true value -- filling up the
queue with ping requests. It now returns a true value.
This commit is contained in:
Evan Prodromou 2009-03-19 09:21:50 -04:00
parent f1041a3b4e
commit e7c57b4307
2 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lib/ping.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, Controlez-Vous, Inc. * Copyright (C) 2009, Control Yourself, Inc.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by * it under the terms of the GNU Affero General Public License as published by
@ -20,8 +20,9 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
function ping_broadcast_notice($notice) { function ping_broadcast_notice($notice) {
if (!$notice->is_local) { if (!$notice->is_local) {
return; return true;
} }
# Array of servers, URL => type # Array of servers, URL => type
@ -43,24 +44,58 @@ function ping_broadcast_notice($notice) {
array('nickname' => $profile->nickname)), array('nickname' => $profile->nickname)),
$tags)); $tags));
# We re-use this tool's fetcher, since it's pretty good $context = stream_context_create(array('http' => array('method' => "POST",
'header' =>
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); "Content-Type: text/xml\r\n".
"User-Agent: Laconica/".LACONICA_VERSION."\r\n",
if (!$fetcher) { 'content' => $request)));
common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__); $file = file_get_contents($notify_url, false, $context);
return false; $response = xmlrpc_decode($file);
} if (xmlrpc_is_fault($response)) {
common_log(LOG_WARNING,
$result = $fetcher->post($notify_url, "XML-RPC error for ping ($notify_url, $notice->id) ".
$req); "$response[faultString] ($response[faultCode])");
} else {
common_log(LOG_INFO,
"Ping success for $notify_url $notice->id");
}
break;
case 'get': case 'get':
case 'post': case 'post':
$args = array('name' => $profile->nickname,
'url' => common_local_url('showstream',
array('nickname' => $profile->nickname)),
'changesURL' => common_local_url('userrss',
array('nickname' => $profile->nickname)));
$fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
if ($type === 'get') {
$result = $fetcher->get($notify_url . '?' . http_build_query($args),
array('User-Agent: Laconica/'.LACONICA_VERSION));
} else {
$result = $fetcher->post($notify_url,
http_build_query($args),
array('User-Agent: Laconica/'.LACONICA_VERSION));
}
if ($result->status != '200') {
common_log(LOG_WARNING,
"Ping error for '$notify_url' ($notice->id): ".
"$result->body");
} else {
common_log(LOG_INFO,
"Ping success for '$notify_url' ($notice->id): ".
"'$result->body'");
}
break;
default: default:
common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type); common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
} }
} }
return true;
} }
function ping_notice_tags($notice) { function ping_notice_tags($notice) {