opendev/gerrit
Code Issues Proposed changes

Allow deactivation loop to continue running after an error

Browse Source 
Currently, the deactivation cron job stops if it fails to deactivate an
account. Change the behaviour such that it logs which account failed,
and continues instead of stopping prematurely.

Also refactor code to reduce nesting and increase readability.

Change-Id: I8542e18368e47500cadb7cbcab27769175023181
This commit is contained in:
Owen Li
2017-11-13 10:16:08 -05:00
parent d9e9eb6f4a
commit b74748af2a
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDeactivator.java
View File

@@ -96,24 +96,40 @@ public class AccountDeactivator implements Runnable {
@Override
public void run() {
log.debug("Running account deactivations");
log.info("Running account deactivations");
try {
int numberOfAccountsDeactivated = 0;
for (AccountState acc : accountQueryProvider.get().query(AccountPredicates.isActive())) {
log.debug("processing account " + acc.getUserName());
if (acc.getUserName() != null && !realm.isActive(acc.getUserName())) {
sif.deactivate(acc.getAccount().getId());
log.debug("deactivated accout " + acc.getUserName());
if (processAccount(acc)) {
numberOfAccountsDeactivated++;
}
}
log.info(
"Deactivations complete, {} account(s) were deactivated", numberOfAccountsDeactivated);
} catch (Exception e) {
log.error("Failed to deactivate inactive accounts " + e.getMessage(), e);
log.error("Failed to complete deactivation of accounts: " + e.getMessage(), e);
}
}
private boolean processAccount(AccountState account) {
log.debug("processing account " + account.getUserName());
try {
if (account.getUserName() != null && !realm.isActive(account.getUserName())) {
sif.deactivate(account.getAccount().getId());
log.info("deactivated account " + account.getUserName());
return true;
}
} catch (Exception e) {
log.error(
"Error deactivating account: {} ({}) {}",
account.getUserName(),
account.getAccount().getId(),
e.getMessage(),
e);
}
return false;
}
@Override
public String toString() {
return "account deactivator";