summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/twittersettings.php2
-rw-r--r--db/laconica_pg.sql2
-rwxr-xr-xscripts/synctwitterfriends.php38
3 files changed, 40 insertions, 2 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 1bce57695..2b742788e 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -392,6 +392,8 @@ class TwittersettingsAction extends ConnectSettingsAction
if ($friendsync) {
save_twitter_friends($user, $twit_user->id, $screen_name, $password);
+ $flink->last_friendsync = common_sql_now();
+ $flink->update();
}
$this->showForm(_('Twitter settings saved.'), true);
diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index f879d7936..a27a616f2 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -291,6 +291,8 @@ create table foreign_link (
noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,
friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */,
profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,
+ last_noticesync timestamp default null /* comment 'last time notices were imported' */,
+ last_friendsync timestamp default null /* comment 'last time friends were imported' */,
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
modified timestamp /* comment 'date this record was modified' */,
diff --git a/scripts/synctwitterfriends.php b/scripts/synctwitterfriends.php
index 794301f0f..bd08ba58d 100755
--- a/scripts/synctwitterfriends.php
+++ b/scripts/synctwitterfriends.php
@@ -32,8 +32,25 @@ define('LACONICA', true);
require_once(INSTALLDIR . '/lib/common.php');
+// Make a lockfile
+$lockfilename = lockFilename();
+if (!($lockfile = @fopen($lockfilename, "w"))) {
+ print "Already running... exiting.\n";
+ exit(1);
+}
+
+// Obtain an exlcusive lock on file (will fail if script is already going)
+if (!@flock( $lockfile, LOCK_EX | LOCK_NB, &$wouldblock) || $wouldblock) {
+ // Script already running - abort
+ @fclose($lockfile);
+ print "Already running... exiting.\n";
+ exit(1);
+}
+
$flink = new Foreign_link();
$flink->service = 1; // Twitter
+$flink->orderBy('last_friendsync');
+$flink->limit(25); // sync this many users during this run
$cnt = $flink->find();
print "Updating Twitter friends subscriptions for $cnt users.\n";
@@ -60,8 +77,11 @@ while ($flink->fetch()) {
continue;
}
- $result = save_twitter_friends($user, $fuser->id,
- $fuser->nickname, $flink->credentials);
+ save_twitter_friends($user, $fuser->id, $fuser->nickname, $flink->credentials);
+
+ $flink->last_friendsync = common_sql_now();
+ $flink->update();
+
if (defined('SCRIPT_DEBUG')) {
print "\nDONE\n";
} else {
@@ -70,4 +90,18 @@ while ($flink->fetch()) {
}
}
+function lockFilename()
+{
+ $piddir = common_config('daemon', 'piddir');
+ if (!$piddir) {
+ $piddir = '/var/run';
+ }
+
+ return $piddir . '/synctwitterfriends.lock';
+}
+
+// Cleanup
+fclose($lockfile);
+unlink($lockfilename);
+
exit(0);