git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit d1558a1d authored by mmn's avatar mmn

Fix Avatar-unlink plus better logging in TwitterImport

parent 1795267d
......@@ -54,7 +54,7 @@ class Avatar extends Managed_DataObject
function delete()
{
$filename = $this->filename;
if (parent::delete()) {
if (parent::delete() && file_exists(Avatar::path($filename))) {
@unlink(Avatar::path($filename));
}
}
......
......@@ -23,7 +23,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
// Tune number of processes and how often to poll Twitter
// XXX: Should these things be in config.php?
define('MAXCHILDREN', 2);
define('POLL_INTERVAL', 60); // in seconds
define('POLL_INTERVAL', 70); // in seconds, Twitter API v1.1 says 15 calls every 15 mins
$shortoptions = 'di::';
$longoptions = array('id::', 'debug');
......
......@@ -317,17 +317,19 @@ class TwitterImport
if ($avatar->filename === $filename) {
return null;
}
common_debug(__METHOD__ . " - Updating profile avatar (profile_id={$profile->id}) " .
"from {$avatar->filename} to {$filename}");
// else we continue with creating a new avatar
} catch (Exception $e) {
// Avatar was not found. We can catch NoResultException or FileNotFoundException
// but generally we just want to continue creating a new avatar.
common_debug(__METHOD__ . " - No avatar found for (profile_id={$profile->id})");
}
$url = "{$path_parts['dirname']}/{$img_root}_{$this->avatarsizename}{$ext}";
$mediatype = $this->getMediatype(mb_substr($ext, 1));
try {
common_debug(__METHOD__ . " - Updating profile avatar (profile_id={$profile->id} to {$filename}");
$this->newAvatar($profile, $url, $filename, $mediatype);
} catch (Exception $e) {
if (file_exists(Avatar::path($filename))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment