jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12958 from annando/issue-12876

Browse source 
Issue 12876: Enhanced logging for the user removal
This commit is contained in:
Hypolite Petovan 2023-03-29 16:42:06 -04:00 committed by GitHub
commit 2ac37b2d45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/Worker/ExpireAndRemoveUsers.php
View file

@ -21,6 +21,7 @@
namespace Friendica\Worker; namespace Friendica\Worker;
use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Database\DBStructure; use Friendica\Database\DBStructure;
use Friendica\Model\Photo; use Friendica\Model\Photo;
@ -55,29 +56,68 @@ class ExpireAndRemoveUsers
// delete user records for recently removed accounts // delete user records for recently removed accounts
$users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < ? AND `uid` != ?", DateTimeFormat::utcNow(), 0]); $users = DBA::select('user', ['uid'], ["`account_removed` AND `account_expires_on` < ? AND `uid` != ?", DateTimeFormat::utcNow(), 0]);
while ($user = DBA::fetch($users)) { while ($user = DBA::fetch($users)) {
Logger::info('Removing user - start', ['uid' => $user['uid']]);
// We have to delete photo entries by hand because otherwise the photo data won't be deleted // We have to delete photo entries by hand because otherwise the photo data won't be deleted
Photo::delete(['uid' => $user['uid']]); $result = Photo::delete(['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted user photos', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting user photos', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
// Delete the contacts of this user // Delete the contacts of this user
$self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]); $self = DBA::selectFirst('contact', ['nurl'], ['self' => true, 'uid' => $user['uid']]);
if (DBA::isResult($self)) { if (DBA::isResult($self)) {
DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]); $result = DBA::delete('contact', ['nurl' => $self['nurl'], 'self' => false]);
if ($result) {
Logger::debug('Deleted the user contact for other users', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting the user contact for other users', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
} }
// Delete all contacts of this user // Delete all contacts of this user
DBA::delete('contact', ['uid' => $user['uid']]); $result = DBA::delete('contact', ['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted user contacts', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting user contacts', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
// These tables contain the permissionset which will also be deleted when a user is deleted. // These tables contain the permissionset which will also be deleted when a user is deleted.
// It seems that sometimes the system wants to delete the records in the wrong order. // It seems that sometimes the system wants to delete the records in the wrong order.
// So when the permissionset is deleted and these tables are still filled then an error is thrown. // So when the permissionset is deleted and these tables are still filled then an error is thrown.
// So we now delete them before all other user related entries are deleted. // So we now delete them before all other user related entries are deleted.
if (DBStructure::existsTable('item')) { if (DBStructure::existsTable('item')) {
DBA::delete('item', ['uid' => $user['uid']]); $result = DBA::delete('item', ['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted user items', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting user items', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
}
$result = DBA::delete('post-user', ['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted post-user entries', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting post-user entries', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
} }
DBA::delete('post-user', ['uid' => $user['uid']]);
DBA::delete('profile_field', ['uid' => $user['uid']]);
DBA::delete('user', ['uid' => $user['uid']]); $result = DBA::delete('profile_field', ['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted profile_field entries', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting profile_field entries', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
$result = DBA::delete('user', ['uid' => $user['uid']]);
if ($result) {
Logger::debug('Deleted user record', ['result' => $result, 'rows' => DBA::affectedRows()]);
} else {
Logger::warning('Error deleting user record', ['errno' => DBA::errorNo(), 'errmsg' => DBA::errorMessage()]);
}
Logger::info('Removing user - done', ['uid' => $user['uid']]);
} }
DBA::close($users); DBA::close($users);
} }