Some clean up -- this still doesn't work, yet. The processes all lose

their database connections, including the parent process.
This commit is contained in:
Zach Copley 2009-04-24 14:27:31 -07:00
parent 5f82ce18f0
commit 6eb5a2566f

View File

@ -32,38 +32,117 @@ define('SCRIPT_DEBUG', true);
require_once(INSTALLDIR . '/lib/common.php'); require_once(INSTALLDIR . '/lib/common.php');
$flink = new Foreign_link(); $children = array();
$flink->service = 1; // Twitter $flink_ids = null;
$cnt = $flink->find();
print "Updating Twitter friends subscriptions for $cnt users.\n"; $MAXCHILDREN = 5;
$POLL_INTERVAL = 10; // 10 seconds
do {
while ($flink->fetch()) { $flink = new Foreign_link();
$flink->service = 1; // Twitter
if (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV) { $cnt = $flink->find();
$user = User::staticGet($flink->user_id);
if (empty($user)) {
common_log(LOG_WARNING, "Unmatched user for ID " . $flink->user_id);
print "Unmatched user for ID $flink->user_id\n";
continue;
}
print 'Retrieving Friends Timeline for ' . $flink->user_id . "\n";
getTimeline($flink);
if (defined('SCRIPT_DEBUG')) { if (defined('SCRIPT_DEBUG')) {
print "\nDONE\n"; print "Updating Twitter friends subscriptions for $cnt users.\n";
}
$flink_ids = array();
// XXX: This only reliably happens once. After the first interation of
// the do loop, the ->find() doesn't work ... lost DB connection?
while ($flink->fetch()) {
if (($flink->noticesync & FOREIGN_NOTICE_RECV) == FOREIGN_NOTICE_RECV) {
$flink_ids[] = $flink->foreign_id;
}
}
$flink->free();
unset($flink);
foreach ($flink_ids as $f){
$pid = pcntl_fork();
if ($pid == -1) {
die ("Couldn't fork!");
}
// Parent
if ($pid) {
if (defined('SCRIPT_DEBUG')) {
print "Parent: forked " . $pid . "\n";
}
$children[] = $pid;
} else {
// Child
// XXX: Each child needs its own DB connection
getTimeline($f);
exit();
}
// Remove child from ps list as it finishes
while(($c = pcntl_wait($status, WNOHANG OR WUNTRACED)) > 0) {
if (defined('SCRIPT_DEBUG')) {
print "Child $c finished.\n";
}
remove_ps($children, $c);
}
// Wait if we have too many kids
if(sizeof($children) > $MAXCHILDREN) {
if (defined('SCRIPT_DEBUG')) {
print "Too many children. Waiting...\n";
}
if( ($c = pcntl_wait($status, WUNTRACED) ) > 0){
if (defined('SCRIPT_DEBUG')) {
print "Finished waiting for $c\n";
}
remove_ps($children, $c);
}
}
}
// Remove all children from the process list before restarting
while(($c = pcntl_wait($status, WUNTRACED)) > 0) {
if (defined('SCRIPT_DEBUG')) {
print "Child $c finished.\n";
}
remove_ps($children, $c);
}
// Rest for a bit before we fetch more statuses
if (defined('SCRIPT_DEBUG')) {
print "Waiting $POLL_INTERVAL secs before hitting Twitter again.\n";
}
sleep($POLL_INTERVAL);
} while (true);
function remove_ps(&$plist, $ps){
for($i = 0; $i < sizeof($plist); $i++){
if($plist[$i] == $ps){
unset($plist[$i]);
$plist = array_values($plist);
break;
} }
} }
} }
function getTimeline($flink) function getTimeline($fid)
{ {
// XXX: Need to reconnect to the DB here?
$flink = Foreign_link::getByForeignID($fid, 1);
$fuser = $flink->getForeignUser(); $fuser = $flink->getForeignUser();
if (empty($fuser)) { if (empty($fuser)) {
@ -71,7 +150,6 @@ function getTimeline($flink)
if (defined('SCRIPT_DEBUG')) { if (defined('SCRIPT_DEBUG')) {
print "Unmatched user for ID $flink->user_id\n"; print "Unmatched user for ID $flink->user_id\n";
} }
continue;
} }
$screenname = $fuser->nickname; $screenname = $fuser->nickname;
@ -83,6 +161,14 @@ function getTimeline($flink)
$timeline = json_decode($timeline_json); $timeline = json_decode($timeline_json);
if (empty($timeline)) {
common_log(LOG_WARNING, "Empty timeline.");
if (defined('SCRIPT_DEBUG')) {
print "Empty timeline!\n";
}
return;
}
foreach ($timeline as $status) { foreach ($timeline as $status) {
// Hacktastic: filter out stuff coming from Laconica // Hacktastic: filter out stuff coming from Laconica
@ -123,7 +209,6 @@ function saveStatus($status, $flink)
if (!$notice) { if (!$notice) {
$notice = new Notice(); $notice = new Notice();
$notice->profile_id = $id; $notice->profile_id = $id;
$notice->query('BEGIN'); $notice->query('BEGIN');
@ -150,8 +235,7 @@ function saveStatus($status, $flink)
} }
} }
# XXX: do we need to change this for remote users? // XXX: Figure out a better way to link replies?
$notice->saveReplies(); $notice->saveReplies();
// XXX: Do we want to polute our tag cloud with hashtags from Twitter? // XXX: Do we want to polute our tag cloud with hashtags from Twitter?
@ -172,7 +256,6 @@ function saveStatus($status, $flink)
$inbox->insert(); $inbox->insert();
} }
} }
function ensureProfile($user) function ensureProfile($user)
@ -180,11 +263,9 @@ function ensureProfile($user)
// check to see if there's already a profile for this user // check to see if there's already a profile for this user
$profileurl = 'http://twitter.com/' . $user->screen_name; $profileurl = 'http://twitter.com/' . $user->screen_name;
$profile = Profile::staticGet('profileurl', $profileurl); $profile = Profile::staticGet('profileurl', $profileurl);
if ($profile) { if ($profile) {
common_debug("Profile for $profile->nickname found."); common_debug("Profile for $profile->nickname found.");
// Check to see if the user's Avatar has changed // Check to see if the user's Avatar has changed
@ -192,7 +273,6 @@ function ensureProfile($user)
return $profile->id; return $profile->id;
} else { } else {
$debugmsg = 'Adding profile and remote profile ' . $debugmsg = 'Adding profile and remote profile ' .
"for Twitter user: $profileurl\n"; "for Twitter user: $profileurl\n";
common_debug($debugmsg, __FILE__); common_debug($debugmsg, __FILE__);
@ -259,8 +339,6 @@ function ensureProfile($user)
function checkAvatar($user, $profile) function checkAvatar($user, $profile)
{ {
common_debug("in check avatar");
$path_parts = pathinfo($user->profile_image_url); $path_parts = pathinfo($user->profile_image_url);
$newname = 'Twitter_' . $user->id . '_' . $newname = 'Twitter_' . $user->id . '_' .
$path_parts['basename']; $path_parts['basename'];
@ -293,7 +371,6 @@ function checkAvatar($user, $profile)
} }
} }
} }
} }
function getMediatype($ext) function getMediatype($ext)
@ -314,13 +391,9 @@ function getMediatype($ext)
return $mediatype; return $mediatype;
} }
function saveAvatars($user, $id) function saveAvatars($user, $id)
{ {
$path_parts = pathinfo($user->profile_image_url); $path_parts = pathinfo($user->profile_image_url);
// basename minus '_normal.ext'
$ext = $path_parts['extension']; $ext = $path_parts['extension'];
$end = strlen('_normal' . $ext); $end = strlen('_normal' . $ext);
$img_root = substr($path_parts['basename'], 0, -($end+1)); $img_root = substr($path_parts['basename'], 0, -($end+1));
@ -450,4 +523,3 @@ function fetchAvatar($url, $filename)
return $result; return $result;
} }