Merge remote-tracking branch 'origin/master'

Evolveum · Nov 25, 2021 · dce730f · dce730f
2 parents 18585d3 + 5c87434
commit dce730f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleServiceBase.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleServiceBase.java
@@ -97,7 +97,8 @@ protected void recordFatalError(@NotNull OperationResult operationResult, @NotNu
                 exceptionMessage += "\n" + psqlException.getMessage();
             }
         }
-        logger.error("Unexpected exception: {}\n  OPERATION RESULT: {}", exceptionMessage, operationResult.debugDump());
+        logger.debug("Unexpected exception (will be rethrown and handled higher): {}\n"
+                + "  OPERATION RESULT: {}", exceptionMessage, operationResult.debugDump());
         operationResult.recordFatalError(t);
     }
     // endregion

diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/ApplicationHomeSetup.java
@@ -72,7 +72,7 @@ private void createMidpointHomeDirectories() {
             if (checkDirectoryExistence(directory)) {
                 continue;
             }
-            LOGGER.warn("Missing midPoint home directory '{}'. Creating.", directory);
+            LOGGER.info("Missing midPoint home directory '{}'. Creating.", directory);
             createDir(directory);
         }
     }
@@ -94,7 +94,7 @@ private boolean checkDirectoryExistence(Path dir) {
         }
 
         if (d.isDirectory()) {
-            LOGGER.info("Directory " + dir + " already exists. Reusing it.");
+            LOGGER.debug("Directory " + dir + " already exists. Reusing it.");
             return true;
         } else {
             return false;

diff --git a/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java b/repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
@@ -195,7 +195,7 @@ private void loadConfiguration() {
     }
 
     private void extractConfigurationFile(File configFile) {
-        LOGGER.warn("Configuration file {} does not exists. Need to do extraction ...", configFile);
+        LOGGER.info("Configuration file {} does not exists, the default one will be extracted.", configFile);
         boolean success = ClassPathUtil.extractFileFromClassPath(this.getConfigFilename(), configFile.getPath());
         if (!success || !configFile.exists()) {
             String message = "Unable to extract configuration file " + this.getConfigFilename() + " from classpath";