Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Sep 14, 2016 · d1819c2 · d1819c2
2 parents 22fd6cc + 9233e25
commit d1819c2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java b/...artz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/cluster/ClusterManager.java
@@ -140,23 +140,23 @@ public void run() {
                         checkClusterConfiguration(result);                          // if error, the scheduler will be stopped
                         nodeRegistrar.updateNodeObject(result);    // however, we want to update repo even in that case
                     } catch (Throwable t) {
-                        LoggingUtils.logException(LOGGER, "Unexpected exception while checking cluster configuration; continuing execution.", t);
+                        LoggingUtils.logUnexpectedException(LOGGER, "Unexpected exception while checking cluster configuration; continuing execution.", t);
                     }
 
                     try {
                         checkWaitingTasks(result);
                     } catch (Throwable t) {
-                        LoggingUtils.logException(LOGGER, "Unexpected exception while checking waiting tasks; continuing execution.", t);
+                        LoggingUtils.logUnexpectedException(LOGGER, "Unexpected exception while checking waiting tasks; continuing execution.", t);
                     }
 
                     try {
                         checkStalledTasks(result);
                     } catch (Throwable t) {
-                        LoggingUtils.logException(LOGGER, "Unexpected exception while checking stalled tasks; continuing execution.", t);
+                        LoggingUtils.logUnexpectedException(LOGGER, "Unexpected exception while checking stalled tasks; continuing execution.", t);
                     }
 
                 } catch(Throwable t) {
-                    LoggingUtils.logException(LOGGER, "Unexpected exception in ClusterManager thread; continuing execution.", t);
+                    LoggingUtils.logUnexpectedException(LOGGER, "Unexpected exception in ClusterManager thread; continuing execution.", t);
                 }
 
                 LOGGER.trace("ClusterManager thread sleeping for " + delay + " msec");
@@ -187,7 +187,7 @@ public void stopClusterManagerThread(long waitTime, OperationResult parentResult
             try {
                 clusterManagerThread.join(waitTime);
             } catch (InterruptedException e) {
-                LoggingUtils.logException(LOGGER, "Waiting for ClusterManagerThread shutdown was interrupted", e);
+                LoggingUtils.logUnexpectedException(LOGGER, "Waiting for ClusterManagerThread shutdown was interrupted", e);
             }
             if (clusterManagerThread.isAlive()) {
                 result.recordWarning("ClusterManagerThread shutdown requested but after " + waitTime + " ms it is still running.");