opendev/gerrit
Code Issues Proposed changes

Ignore account not active error in deactivation cron

Browse Source 
Change-Id: I8d5cd9ea2baa660a8432bd0d676cfe36b9bef86d
This commit is contained in:
Owen Li
2017-11-14 10:42:43 -05:00
parent b74748af2a
commit 79d007d0c4
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ package com.google.gerrit.server.account;
import static com.google.gerrit.server.config.ScheduleConfig.MISSING_CONFIG;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.lifecycle.LifecycleModule;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.ScheduleConfig;
@@ -119,6 +120,8 @@ public class AccountDeactivator implements Runnable {
log.info("deactivated account " + account.getUserName());
return true;
}
} catch (ResourceConflictException e) {
log.info("Account {} already deactivated, continuing...", account.getUserName());
} catch (Exception e) {
log.error(
"Error deactivating account: {} ({}) {}",