petermolnar/wp-webmention-again
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing previously unchecked response code for sending; switched any code that earlier deleted database entries to done;

Browse source
This commit is contained in:
Peter Molnar 2016-03-13 22:09:17 +00:00
parent 3063d956be
commit fcf6476f9f
3 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
receiver.php
View file

@ -328,7 +328,7 @@ class WP_Webmention_Again_Receiver extends WP_Webmention_Again {
// too many retries, drop this mention and walk away
if ( $received->tries >= static::retry() ) {
static::debug( " this mention was tried earlier and failed too many times, drop it", 5);
static::queue_del ( $received->id );
//static::queue_del ( $received->id );
continue;
}
@ -349,7 +349,8 @@ class WP_Webmention_Again_Receiver extends WP_Webmention_Again {
if ( true === $ins ) {
static::debug( " duplicate (or something similar): this queue element has to be ignored; deleting queue entry", 5);
static::queue_del ( $received->id );
//static::queue_del ( $received->id );
static::queue_done ( $received->id );
}
elseif ( is_numeric( $ins ) ) {
static::debug( " all went well, we have a comment id: {$ins}, deleting queue entry", 5);

24
sender.php
View file

@ -217,8 +217,8 @@ class WP_Webmention_Again_Sender extends WP_Webmention_Again {
// try sending
$s = static::send( $send->source, $send->target );
if ( is_wp_error ( $s ) ) {
static::debug( " sending failed: " . $s->get_error_message(), 5);
if ( false == $s ) {
static::debug( " sending failed: ", 5);
}
else {
static::debug( " sending succeeded!", 5);
@ -274,7 +274,25 @@ class WP_Webmention_Again_Sender extends WP_Webmention_Again {
// use the response to do something usefull
// do_action( 'webmention_post_send', $response, $source, $target, $post_ID );
return $response;
if ( is_wp_error( $response ) ) {
static::debug( "sending failed: " . $response->get_error_message(), 4);
return false;
}
if ( ! is_array( $response ) || ! isset( $response['response'] ) || ! isset( $response['response']['code'] ) || empty( $response['response']['code'] ) ) {
static::debug( "sending failed: the response is empty", 4);
return false;
}
if ( 200 <= $response['response']['code'] && 300 > $response['response']['code'] ) {
static::debug( "sending succeeded: ${$response['response']['code']}, message: {$response['response']['message']}", 5);
return true;
}
else {
static::debug( "wrong response code, this sending probably failed: {$response['response']['code']}, message: {$response['response']['message']}", 4);
return false;
}
}
return false;

33
wp-webmention-again.php
View file

@ -332,6 +332,8 @@ class WP_Webmention_Again {
static::debug('Something went wrong: ' . $e->getMessage(), 4);
}
//do_action ( 'wp_webmention_again_done', $id );
return $req;
}
@ -354,7 +356,7 @@ class WP_Webmention_Again {
global $wpdb;
$dbname = $wpdb->prefix . static::tablename;
$q = $wpdb->prepare( "SELECT * FROM `{$dbname}` WHERE `direction` = '%s' and `status` = 0 LIMIT %d;", $direction, $limit );
$q = $wpdb->prepare( "SELECT * FROM `{$dbname}` WHERE `direction` = '%s' and `status` = 0 and `tries` < ". static::retry() ." LIMIT %d;", $direction, $limit );
try {
$req = $wpdb->get_results( $q );
@ -405,6 +407,35 @@ class WP_Webmention_Again {
return false;
}
/**
* get a single webmention based on id
*
* @param int $id webmention id
*
* @return array of webmention
*
*
public static function webmention_get ( $id ) {
global $wpdb;
$dbname = $wpdb->prefix . static::tablename;
$q = $wpdb->prepare( "SELECT * FROM `{$dbname}` WHERE `id` = '%d'", $id );
try {
$req = $wpdb->get_results( $q );
}
catch (Exception $e) {
static::debug('Something went wrong: ' . $e->getMessage(), 4);
}
if ( ! empty ( $req ) )
return $req;
return false;
}
*/
/**
* extended wp_remote_get with debugging
*