Timeout status code fix

Author: JanPetterMG

docs/sql/cache.md

@@ -43,10 +43,10 @@ CREATE TABLE `robotstxt__cache0` (
   `base`       VARCHAR(250)
                COLLATE utf8_unicode_ci      NOT NULL,
   `content`    TEXT COLLATE utf8_unicode_ci NOT NULL,
-  `statusCode` SMALLINT(4) UNSIGNED         NOT NULL,
+  `statusCode` SMALLINT(4) UNSIGNED DEFAULT NULL,
   `validUntil` INT(10) UNSIGNED             NOT NULL,
   `nextUpdate` INT(10) UNSIGNED             NOT NULL,
-  `worker`     TINYINT(3) UNSIGNED DEFAULT NULL,
+  `worker`     TINYINT(3) UNSIGNED  DEFAULT NULL,
   PRIMARY KEY (`base`),
   KEY `worker` (`worker`, `nextUpdate`)
 )

src/Cache.php

@@ -180,9 +180,14 @@ private function push(UriClient $client)
         $statusCode = $client->getStatusCode();
         $nextUpdate = $client->nextUpdate();
         if (
-            $statusCode >= 500 &&
-            $statusCode < 600 &&
             mb_stripos($base, 'http') === 0 &&
+            (
+                $statusCode === null ||
+                (
+                    $statusCode >= 500 &&
+                    $statusCode < 600
+                )
+            ) &&
             $this->displacePush($base, $nextUpdate)
         ) {
             return true;
@@ -238,10 +243,29 @@ private function displacePush($base, $nextUpdate)
                 $query->bindParam(':nextUpdate', $nextUpdate, PDO::PARAM_INT);
                 return $query->execute();
             }
+            $this->invalidate($base);
         }
         return false;
     }
 
+    /**
+     * Invalidate cache
+     *
+     * @param $baseUri
+     * @return bool
+     */
+    public function invalidate($baseUri)
+    {
+        $base = $this->urlBase($this->urlEncode($baseUri));
+        $query = $this->pdo->prepare(<<<SQL
+DELETE FROM robotstxt__cache0
+WHERE base = :base;
+SQL
+        );
+        $query->bindParam(':base', $base, PDO::PARAM_STR);
+        return $query->execute();
+    }
+
     /**
      * Process the update queue
      *
@@ -314,22 +338,4 @@ public function clean($delay = 600)
         $query->bindParam(':delay', $delay, PDO::PARAM_INT);
         return $query->execute();
     }
-
-    /**
-     * Invalidate cache
-     *
-     * @param $baseUri
-     * @return bool
-     */
-    public function invalidate($baseUri)
-    {
-        $base = $this->urlBase($this->urlEncode($baseUri));
-        $query = $this->pdo->prepare(<<<SQL
-DELETE FROM robotstxt__cache0
-WHERE base = :base;
-SQL
-        );
-        $query->bindParam(':base', $base, PDO::PARAM_STR);
-        return $query->execute();
-    }
 }

src/SQL/cache.sql

@@ -2,10 +2,10 @@ CREATE TABLE `robotstxt__cache0` (
   `base`       VARCHAR(250)
                COLLATE utf8_unicode_ci      NOT NULL,
   `content`    TEXT COLLATE utf8_unicode_ci NOT NULL,
-  `statusCode` SMALLINT(4) UNSIGNED         NOT NULL,
+  `statusCode` SMALLINT(4) UNSIGNED DEFAULT NULL,
   `validUntil` INT(10) UNSIGNED             NOT NULL,
   `nextUpdate` INT(10) UNSIGNED             NOT NULL,
-  `worker`     TINYINT(3) UNSIGNED DEFAULT NULL,
+  `worker`     TINYINT(3) UNSIGNED  DEFAULT NULL,
   PRIMARY KEY (`base`),
   KEY `worker` (`worker`, `nextUpdate`)
 )

src/UriClient.php

@@ -84,7 +84,7 @@ public function __construct($baseUri, array $guzzleConfig = [], $byteLimit = sel
             $this->encoding = $this->headerEncoding($response->getHeader('content-type'));
             $this->maxAge = $this->headerMaxAge($response->getHeader('cache-control'));
         } catch (GuzzleHttp\Exception\TransferException $e) {
-            $this->statusCode = 404;
+            $this->statusCode = null;
             $this->contents = '';
             $this->encoding = self::ENCODING;
             $this->maxAge = 0;
@@ -153,7 +153,7 @@ public function getBaseUri()
     /**
      * Status code
      *
-     * @return int
+     * @return int|null
      */
     public function getStatusCode()
     {

tests/CacheDisplaceSQLTest.php

@@ -75,17 +75,19 @@ public function testCacheDisplaceSQL()
     private function check($base)
     {
         $pdo = new PDO($GLOBALS['DB_DSN'], $GLOBALS['DB_USER'], $GLOBALS['DB_PASSWD']);
+        $parser = new RobotsTxtParser\Cache($pdo);
+        $this->assertInstanceOf('vipnytt\RobotsTxtParser\Cache', $parser);
+
         // Insert fake data
+        $parser->invalidate($base);
         $query = $pdo->prepare(<<<SQL
-INSERT IGNORE INTO robotstxt__cache0 (base, content, statusCode, validUntil, nextUpdate)
-VALUES (:base, '', 555, UNIX_TIMESTAMP() + 604800, UNIX_TIMESTAMP() - 3600);
+INSERT INTO robotstxt__cache0 (base, content, statusCode, validUntil, nextUpdate)
+VALUES (:base, '', NULL, UNIX_TIMESTAMP() + 86400, UNIX_TIMESTAMP() - 3600);
 SQL
         );
         $query->bindParam(':base', $base, PDO::PARAM_STR);
         $query->execute();
 
-        $parser = new RobotsTxtParser\Cache($pdo);
-        $this->assertInstanceOf('vipnytt\RobotsTxtParser\Cache', $parser);
         $parser->client($base);
 
         $parser->cron();
@@ -94,19 +96,13 @@ private function check($base)
         $query = $pdo->prepare(<<<SQL
 SELECT *
 FROM robotstxt__cache0
-WHERE base = :base AND validUntil > UNIX_TIMESTAMP() AND nextUpdate > UNIX_TIMESTAMP() AND statusCode >= 500;
+WHERE base = :base AND validUntil > UNIX_TIMESTAMP() AND nextUpdate > UNIX_TIMESTAMP() AND statusCode IS NULL;
 SQL
         );
         $query->bindParam(':base', $base, PDO::PARAM_STR);
         $query->execute();
         // Delete fake data
-        $cleanup = $pdo->prepare(<<<SQL
-DELETE FROM robotstxt__cache0
-WHERE base = :base;
-SQL
-        );
-        $cleanup->bindParam(':base', $base, PDO::PARAM_STR);
-        $cleanup->execute();
+        $parser->invalidate($base);
         if ($query->rowCount() > 0) {
             return true;
         }