summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-19 09:21:50 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-19 09:21:50 -0400
commite7c57b43073888d18760e2411b207a4ee2cf508b (patch)
tree6897748553f3a3b5fd5b9438b4e5cdb199bc16f2
parentf1041a3b4e1f728ddffd8df80a5d5d6f5520fea6 (diff)
ping handler returns proper boolean response
The ping queue handler wasn't returning a true value -- filling up the queue with ping requests. It now returns a true value.
-rw-r--r--lib/ping.php77
-rw-r--r--scripts/pingqueuehandler.php4
2 files changed, 58 insertions, 23 deletions
diff --git a/lib/ping.php b/lib/ping.php
index 32c0b9806..2cbec2f21 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -1,7 +1,7 @@
<?php
/*
* 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
* it under the terms of the GNU Affero General Public License as published by
@@ -20,49 +20,84 @@
if (!defined('LACONICA')) { exit(1); }
function ping_broadcast_notice($notice) {
+
if (!$notice->is_local) {
- return;
+ return true;
}
-
+
# Array of servers, URL => type
$notify = common_config('ping', 'notify');
$profile = $notice->getProfile();
$tags = ping_notice_tags($notice);
-
+
foreach ($notify as $notify_url => $type) {
switch ($type) {
case 'xmlrpc':
case 'extended':
$req = xmlrpc_encode_request('weblogUpdates.ping',
array($profile->nickname, # site name
- common_local_url('showstream',
+ common_local_url('showstream',
array('nickname' => $profile->nickname)),
common_local_url('shownotice',
array('notice' => $notice->id)),
- common_local_url('userrss',
+ common_local_url('userrss',
array('nickname' => $profile->nickname)),
$tags));
-
- # We re-use this tool's fetcher, since it's pretty good
-
- $fetcher = Auth_Yadis_Yadis::getHTTPFetcher();
- if (!$fetcher) {
- common_log(LOG_WARNING, 'Failed to initialize Yadis fetcher.', __FILE__);
- return false;
- }
-
- $result = $fetcher->post($notify_url,
- $req);
-
+ $context = stream_context_create(array('http' => array('method' => "POST",
+ 'header' =>
+ "Content-Type: text/xml\r\n".
+ "User-Agent: Laconica/".LACONICA_VERSION."\r\n",
+ 'content' => $request)));
+ $file = file_get_contents($notify_url, false, $context);
+ $response = xmlrpc_decode($file);
+ if (xmlrpc_is_fault($response)) {
+ common_log(LOG_WARNING,
+ "XML-RPC error for ping ($notify_url, $notice->id) ".
+ "$response[faultString] ($response[faultCode])");
+ } else {
+ common_log(LOG_INFO,
+ "Ping success for $notify_url $notice->id");
+ }
+ break;
+
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:
common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
- }
+ }
}
+
+ return true;
}
-
+
function ping_notice_tags($notice) {
$tag = new Notice_tag();
$tag->notice_id = $notice->id;
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
index 55a266e4a..ada6ecdba 100644
--- a/scripts/pingqueuehandler.php
+++ b/scripts/pingqueuehandler.php
@@ -34,7 +34,7 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
set_error_handler('common_error_handler');
class PingQueueHandler extends QueueHandler {
-
+
function transport() {
return 'ping';
}
@@ -47,7 +47,7 @@ class PingQueueHandler extends QueueHandler {
function handle_notice($notice) {
return ping_broadcast_notice($notice);
}
-
+
function finish() {
}
}