Changeset 1487

Timestamp:

08/14/11 16:34:02 (22 months ago)

Author:

Torben Brodt

Message:

cure failcount

Location:

twitter

Files:

• files/lib/system/cronjob/TwitterUpdateJob.class.php (modified) (4 diffs)
• package.xml (modified) (2 diffs)

twitter/files/lib/system/cronjob/TwitterUpdateJob.class.php

@@ -16 +16 @@
          */
         public function execute($data) {
+
+                // with every run decreaes fail count
+                $sql = "UPDATE          wcf".WCF_N."_twitter_feed
+                        SET             failcount = failcount - 1
+                        WHERE           failcount > 0";
+                WCF::getDB()->sendQuery($sql);
+
+                // get active feeds
                 $sql = "SELECT          *
                         FROM            wcf".WCF_N."_twitter_feed ti
                         INNER JOIN      wcf".WCF_N."_twitter_account ta ON ti.accountID = ta.accountID
                         INNER JOIN      wcf".WCF_N."_user_to_twitter utt ON utt.accountID = ta.accountID
-                        WHERE           ti.failcount < 5";
+                        WHERE           ti.failcount < 4";
                 $result = WCF::getDB()->sendQuery($sql);
                 $i = 0;
@@ -28 +36 @@
                 }
 
-                // try to active system user feeds
+                // try to activate system user feeds
                 if($i == 0) {
                         $user = $this->getSystemUser();
                         if($user) {
-                                $sql = "INSERT INTO
+                                $sql = "INSERT IGNORE INTO
                                                         wcf".WCF_N."_twitter_feed
                                                         (accountID, action)
                                         VALUES          (".intval($user['accountID']).", 'user_timeline'),
-                                                        (".intval($user['accountID']).", 'mentions')
-                                        ON DUPLICATE KEY UPDATE
-                                                        failcount = IF(failcount > 1, failcount - 1, 0)";
+                                                        (".intval($user['accountID']).", 'mentions')";
                                 $result = WCF::getDB()->sendQuery($sql);
                         }
@@ -106 +112 @@
                         // increase fail count and stop
                         $sql = 'UPDATE  wcf'.WCF_N.'_twitter_feed
-                                SET     failcount = failcount + 1
+                                SET     failcount = failcount + 3
                                 WHERE   feedID = '.intval($me['feedID']);
                         WCF::getDB()->sendQuery($sql);
@@ -137 +143 @@
                         $sql = 'UPDATE  wcf'.WCF_N.'_twitter_feed
                                 SET     since_id = '.intval($maxid + 1).',
-                                        failcount = IF(failcount > 1, failcount - 1, 0)
+                                        failcount = 0
+                                WHERE   feedID = '.intval($me['feedID']);
+                        WCF::getDB()->sendQuery($sql);
+                }
+                
+                else if($me['failcount']) {
+
+                        // reset fail count, if everything is ok
+                        $sql = 'UPDATE  wcf'.WCF_N.'_twitter_feed
+                                SET     failcount = 0
                                 WHERE   feedID = '.intval($me['feedID']);
                         WCF::getDB()->sendQuery($sql);

twitter/package.xml

@@ -4 +4 @@
                 <packagename><![CDATA[Twitter (WCF)]]></packagename>
                 <packagedescription><![CDATA[Twitter is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: What are you doing?]]></packagedescription>
-                <version>2.3.0</version>
+                <version>2.3.1</version>
                 <date>DATE</date>
                 <isunique>1</isunique>
@@ -42 +42 @@
                 <languages languagecode="de-informal">de.xml</languages>
                 <languages languagecode="en">en.xml</languages>
+        </instructions>
+        <instructions type="update" fromversion="2.3.0">
+                <files>files.tar</files>
         </instructions>
         <instructions type="update" fromversion="2.2.3">