Skip to content
Snippets Groups Projects
Commit fa604a93 authored by OZGCloud's avatar OZGCloud
Browse files

OZG-2653 Auf log4j2 umgestellt

parent 6a120e60
No related branches found
No related tags found
No related merge requests found
<?xml version="1.0"?> <?xml version="1.0"?>
<project <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.itvsh.kop.user</groupId> <groupId>de.itvsh.kop.user</groupId>
...@@ -137,6 +134,16 @@ ...@@ -137,6 +134,16 @@
<version>1.5.1.Final</version> <version>1.5.1.Final</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.18.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.18.0</version>
</dependency>
<!-- Test --> <!-- Test -->
<dependency> <dependency>
......
...@@ -10,7 +10,6 @@ import org.mapstruct.ReportingPolicy; ...@@ -10,7 +10,6 @@ import org.mapstruct.ReportingPolicy;
@Mapper(componentModel = "cdi", unmappedTargetPolicy = ReportingPolicy.WARN) @Mapper(componentModel = "cdi", unmappedTargetPolicy = ReportingPolicy.WARN)
public interface UserRepresentationMapper { public interface UserRepresentationMapper {
@Mapping(target = "id", ignore = true)
@Mapping(target = "externalId", expression = "java(getExternalId(userRep))") @Mapping(target = "externalId", expression = "java(getExternalId(userRep))")
@Mapping(target = "organisationseinheitId", ignore = true) @Mapping(target = "organisationseinheitId", ignore = true)
@Mapping(target = "organisationseinheitIds", ignore = true) @Mapping(target = "organisationseinheitIds", ignore = true)
......
package de.itvsh.kop.user.sync; package de.itvsh.kop.user.sync;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.logging.Level;
import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject; import javax.inject.Inject;
...@@ -11,10 +10,10 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -11,10 +10,10 @@ import org.apache.commons.collections4.CollectionUtils;
import de.itvsh.kop.user.UserService; import de.itvsh.kop.user.UserService;
import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
import io.quarkus.scheduler.Scheduled; import io.quarkus.scheduler.Scheduled;
import lombok.extern.java.Log; import lombok.extern.log4j.Log4j2;
@ApplicationScoped @ApplicationScoped
@Log @Log4j2
public class SyncService { public class SyncService {
@Inject @Inject
UserService userService; UserService userService;
...@@ -30,7 +29,7 @@ public class SyncService { ...@@ -30,7 +29,7 @@ public class SyncService {
if (isNotLocked()) { if (isNotLocked()) {
ZonedDateTime syncDateTime = ZonedDateTime.now(); ZonedDateTime syncDateTime = ZonedDateTime.now();
Lock lock = lockUserDatabase(syncDateTime); Lock lock = lockUserDatabase(syncDateTime);
LOG.log(Level.INFO, "Started sync at " + syncDateTime); LOG.info("Started sync at " + syncDateTime);
doSync(syncDateTime, lock); doSync(syncDateTime, lock);
} }
...@@ -44,14 +43,13 @@ public class SyncService { ...@@ -44,14 +43,13 @@ public class SyncService {
userService.save(syncUsers); userService.save(syncUsers);
} catch (Exception e) { } catch (Exception e) {
LOG.log(Level.SEVERE, "Error syncing usermanager database", e); LOG.error("Error syncing usermanager database", e);
} finally { } finally {
unlockUserDatabase(lock); unlockUserDatabase(lock);
} }
} }
Lock lockUserDatabase(ZonedDateTime syncDateTime) { Lock lockUserDatabase(ZonedDateTime syncDateTime) {
LOG.log(Level.INFO, "Db locked at " + syncDateTime);
var timestamp = syncDateTime.toInstant().toEpochMilli(); var timestamp = syncDateTime.toInstant().toEpochMilli();
Lock lock = Lock.builder().timestamp(timestamp).build(); Lock lock = Lock.builder().timestamp(timestamp).build();
lockRepository.persist(lock); lockRepository.persist(lock);
...@@ -61,8 +59,8 @@ public class SyncService { ...@@ -61,8 +59,8 @@ public class SyncService {
} }
void unlockUserDatabase(Lock lock) { void unlockUserDatabase(Lock lock) {
LOG.log(Level.INFO, "Db unlocked");
lockRepository.delete(lock); lockRepository.delete(lock);
LOG.info("Db locked released");
} }
boolean isNotLocked() { boolean isNotLocked() {
......
package de.itvsh.kop.user;
import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
class UserITCase extends UserControllerTest {
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment