From 1d29e016dbb887eb4f032ae23cde74bd0cec0fe9 Mon Sep 17 00:00:00 2001 From: lukas-krecan Date: Mon, 12 Dec 2022 09:45:54 +0100 Subject: [PATCH] More appropriate log levels --- .../ext/LockDatabaseChangeLogGeneratorExt.java | 2 +- .../java/liquibase/lockservice/ext/LockServiceExt.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/liquibase/lockservice/ext/LockDatabaseChangeLogGeneratorExt.java b/src/main/java/liquibase/lockservice/ext/LockDatabaseChangeLogGeneratorExt.java index c9c0c13..769faa3 100644 --- a/src/main/java/liquibase/lockservice/ext/LockDatabaseChangeLogGeneratorExt.java +++ b/src/main/java/liquibase/lockservice/ext/LockDatabaseChangeLogGeneratorExt.java @@ -67,7 +67,7 @@ private String generateLockedBy(Database database) { } String lockedByValue = dbPid + LOCKED_BY_SEPARATOR + dbPidStartTime; - LOG.warning("Setting LOCKEDBY value to " + lockedByValue); + LOG.info("Setting LOCKEDBY value to " + lockedByValue); return lockedByValue; } } diff --git a/src/main/java/liquibase/lockservice/ext/LockServiceExt.java b/src/main/java/liquibase/lockservice/ext/LockServiceExt.java index 70e29f2..c8262b8 100644 --- a/src/main/java/liquibase/lockservice/ext/LockServiceExt.java +++ b/src/main/java/liquibase/lockservice/ext/LockServiceExt.java @@ -36,22 +36,22 @@ public void waitForLock() throws LockException { if (this.hasDatabaseChangeLogLockTable()) { Boolean locked = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForObject( new SelectFromDatabaseChangeLogLockStatement("LOCKED"), Boolean.class); - if (locked != null && locked == Boolean.TRUE) { + if (locked == Boolean.TRUE) { try { String lockedBy = Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database).queryForObject( new SelectFromDatabaseChangeLogLockStatement("LOCKEDBY"), String.class); if (lockedBy != null && !lockedBy.isBlank()) { - LOG.warning("!!!!! Database is locked by: " + lockedBy + " !!!!!"); + LOG.info("!!!!! Database is locked by: " + lockedBy + " !!!!!"); StringTokenizer tok = new StringTokenizer(lockedBy, LOCKED_BY_SEPARATOR); if (tok.countTokens() >= 2) { String dbPid = tok.nextToken(); String dbPidStart = tok.nextToken(); boolean lockHolderActive = isPidActive(dbPid, dbPidStart); if (!lockHolderActive) { - LOG.warning("Database Lock was created by an inactive client (pid=" + dbPid + " , startTime=" + dbPidStart + "). Releasing lock!"); + LOG.info("Database Lock was created by an inactive client (pid=" + dbPid + " , startTime=" + dbPidStart + "). Releasing lock!"); releaseLock(); } else { - LOG.warning("Database Lock was created by a still active client (pid=" + dbPid + " , startTime=" + dbPidStart + "). NOT Releasing lock!"); + LOG.info("Database Lock was created by a still active client (pid=" + dbPid + " , startTime=" + dbPidStart + "). NOT Releasing lock!"); } } else { LOG.warning("Databased is locked, cannot parse LOCKEDBY value: '" + lockedBy + "' in table " + database.getDatabaseChangeLogLockTableName()); @@ -63,7 +63,7 @@ public void waitForLock() throws LockException { LOG.severe("Can't read the LOCKEDBY field from " + database.getDatabaseChangeLogLockTableName(), e); } } else { - LOG.warning("**** Databased is not locked **** "); + LOG.info("**** Database is not locked **** "); } } } catch (DatabaseException e) {