From ea0d000b592479c3437bc890c690577f84951ad4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 14 Feb 2019 14:56:38 +0100
Subject: [server] DeleteOldUsers: Don't print names of users we keep

---
 .../java/org/openslx/bwlp/sat/database/mappers/DbUser.java  | 13 ++++++++-----
 .../org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java    |  7 ++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
index 83b738a1..7e31a04a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
@@ -299,17 +299,20 @@ public class DbUser {
 	 * 
 	 * @param user the user to delete
 	 */
-	public static void deleteUser(UserInfo user) throws SQLException {
+	public static boolean deleteUser(UserInfo user) throws SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
+			MysqlStatement stmt = connection.prepareStatement("DELETE FROM user WHERE userid = :userid");
+			stmt.setString("userid", user.userId);
 			try {
-				MysqlStatement stmt = connection.prepareStatement("DELETE FROM user WHERE userid = :userid");
-				stmt.setString("userid", user.userId);
-				stmt.executeUpdate();
+				int num = stmt.executeUpdate();
 				connection.commit();
-			} catch (Exception e) {
+				return num > 0;
+			} catch (SQLException e) {
 				connection.rollback();
+				return false;
 			}
 		} catch (SQLException e) {
+			LOGGER.error("Query failed in deleteUser()", e);
 			throw e;
 		}
 	}
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
index ebc0cfbd..9c70b699 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
@@ -65,10 +65,11 @@ public class DeleteOldUsers implements Runnable {
 		}
 		for (UserInfo user : inactiveUsers) {
 			try {
-				DbUser.deleteUser(user);
-				DbLog.log((String)null, null, "Deleted inactive user " + Formatter.userFullName(user));
+				if (DbUser.deleteUser(user)) {
+					DbLog.log((String)null, null, "Deleted inactive user " + Formatter.userFullName(user));
+				}
 			} catch (SQLException e) {
-				// Ignore, constraint
+				// Already logged
 			}
 		}
 	}
-- 
cgit v1.2.3-55-g7522