retry pinging only 5 times

diff --git a/src/stapibas/Cli.php b/src/stapibas/Cli.php
index 683a726e9a1fdcb8cf7ccceb7174a60de57ee4e8..7ba2b9eef5f350f24c0bdfd73686be2ff3b281e2 100644 (file)
--- a/src/stapibas/Cli.php
+++ b/src/stapibas/Cli.php
@@ -118,7 +118,7 @@ class Cli
             array(
                 'short_name'  => '-t',
                 'long_name'   => '--tasks',
-                'description' => 'Execute the given tasks (comma-separated)',
+                'description' => 'Execute the given tasks (comma-separated: feeds,entries,urls)',
                 'help_name'   => 'tasks',
                 'action'      => 'StoreString',
                 'default'     => 'feeds,entries,urls',

diff --git a/src/stapibas/Feed/PingUrls.php b/src/stapibas/Feed/PingUrls.php
index 22993527d8601c6e76adfdb901c68470ce599e87..1e98f0a4ea53bf9167cd5cc1e361f1c758b821db 100644 (file)
--- a/src/stapibas/Feed/PingUrls.php
+++ b/src/stapibas/Feed/PingUrls.php
@@ -33,7 +33,8 @@ class Feed_PingUrls
     {
         $this->log->info('Pinging all URLs..');
         $res = $this->db->query(
-            'SELECT fe_url, feu_id, feu_url FROM feedentries, feedentryurls'
+            'SELECT fe_url, feu_id, feu_url, feu_tries'
+            . ' FROM feedentries, feedentryurls'
             . ' WHERE fe_id = feu_fe_id' . $this->sqlNeedsUpdate()
         );
         $items = 0;
@@ -89,7 +90,11 @@ class Feed_PingUrls
                 'UPDATE feedentryurls SET'
                 . '  feu_pinged = 1'
                 . ', feu_updated = NOW()'
-                . ', feu_error = ' . $this->db->quote($e->getMessage())
+                . ', feu_error = 1'
+                . ', feu_error_code = ' . $this->db->quote($e->getCode())
+                . ', feu_error_message = ' . $this->db->quote($e->getMessage())
+                . ', feu_tries = ' . $this->db->quote($row->feu_tries + 1)
+                . ', feu_retry = ' . $this->sqlRetry($e)
                 . ' WHERE feu_id = ' . $this->db->quote($row->feu_id)
             );
             return;
@@ -102,7 +107,11 @@ class Feed_PingUrls
                 'UPDATE feedentryurls SET'
                 . '  feu_pinged = 1'
                 . ', feu_updated = NOW()'
-                . ', feu_error = ""'
+                . ', feu_error = 0'
+                . ', feu_error_code = ""'
+                . ', feu_error_message = ""'
+                . ', feu_tries = ' . $this->db->quote($row->feu_tries + 1)
+                . ', feu_retry = 0'
                 . ' WHERE feu_id = ' . $this->db->quote($row->feu_id)
             );
         } else {
@@ -113,15 +122,18 @@ class Feed_PingUrls
                 $this->log->info(
                     'Pingback response: Status code ' . $httpRes->getStatus()
                     . ', headers: ' . print_r($httpRes->getHeader(), true)
-                    . ', body: ' . $httpRes->getBody()
                 );
+                //. ', body: ' .$httpRes->getBody()
             }
             $this->db->exec(
                 'UPDATE feedentryurls SET'
                 . '  feu_pinged = 1'
                 . ', feu_updated = NOW()'
-                . ', feu_error = '
-                . $this->db->quote($res->getCode() . ': ' . $res->getMessage())
+                . ', feu_error = 1'
+                . ', feu_error_code = ' . $this->db->quote($res->getCode())
+                . ', feu_error_message = ' . $this->db->quote($res->getMessage())
+                . ', feu_tries = ' . $this->db->quote($row->feu_tries + 1)
+                . ', feu_retry = ' . $this->sqlRetry($res)
                 . ' WHERE feu_id = ' . $this->db->quote($row->feu_id)
             );
         }
@@ -132,7 +144,35 @@ class Feed_PingUrls
         if ($this->deps->options['force']) {
             return '';
         }
-        return '  AND feu_active = 1 AND feu_pinged = 0';
+        $sqlRetry = '(feu_retry = 1 AND feu_tries < 5)';
+        //FIXME: wait at least 1 hour before retrying
+
+        return ' AND feu_active = 1 AND (feu_pinged = 0 OR ' . $sqlRetry . ')';
+    }
+
+    /**
+     * Determines if it should be retried to pingback the URL after some time
+     *
+     * @param $obj mixed Exception or Pingback response
+     */
+    protected function sqlRetry($obj)
+    {
+        if ($obj instanceof \Exception) {
+            return '1';
+        }
+
+        switch ($obj->getCode()) {
+        case -32601:  //they have xmp-rpc, but do not support pingback
+        case 17:  //they think we don't link to them
+        case 18:  //they think we send out pingback spam
+        case 48:  //already registered
+        case 49:  //access denied
+        case 200: //pingback not supported
+        case 201: //Unvalid target URI
+            return '0';
+        }
+
+        return '1';
     }
 }
 ?>

diff --git a/src/stapibas/PDO.php b/src/stapibas/PDO.php
index a85008bbb5278dbbaee4b825931a180fcad46daa..5dd934ee1e08f237896569e8e146850c5ced709d 100644 (file)
--- a/src/stapibas/PDO.php
+++ b/src/stapibas/PDO.php
@@ -17,6 +17,16 @@ class PDO extends \PDO
         $this->handleError();
     }
 
+    public function exec($statement)
+    {
+        $res = parent::exec($statement);
+        if ($res !== false) {
+            return $res;
+        }
+
+        $this->handleError();
+    }
+
     protected function handleError()
     {
         echo "SQL error\n";