From 70a843b112cf3dac92f56e5d482b14250fecf684 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Thu, 5 Jan 2023 09:54:41 +0800
Subject: [PATCH] =?UTF-8?q?Provisioning=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provision/thread/ProvisioningRunner.java  | 19 +++++++++++++------
 .../thread/ProvisioningRunnerThread.java      | 10 ++++++++--
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java
index 5b9f203d..fe435c08 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunner.java
@@ -63,12 +63,16 @@ public class ProvisioningRunner {
     
 	
 	public void provisions() {
-		List<Connectors> listConnectors = connectorsService.query(new Query().eq("status", 1).eq("justintime", 1));
-		List<ProvisionMessage> listProvisionMessage = jdbcTemplate.query(PROVISION_SELECT_STATEMENT, new ProvisionMessageRowMapper());
-		for(ProvisionMessage msg : listProvisionMessage) {
-			for(Connectors connector: listConnectors) {
-				provision(msg,connector);
+		try {
+			List<Connectors> listConnectors = connectorsService.query(new Query().eq("status", 1).eq("justintime", 1));
+			List<ProvisionMessage> listProvisionMessage = jdbcTemplate.query(PROVISION_SELECT_STATEMENT, new ProvisionMessageRowMapper());
+			for(ProvisionMessage msg : listProvisionMessage) {
+				for(Connectors connector: listConnectors) {
+					provision(msg,connector);
+				}
 			}
+		}catch(Exception e) {
+			_logger.error("provisions Exception",e);
 		}
 	}
 	
@@ -129,7 +133,10 @@ public class ProvisioningRunner {
 	}
 	
 	public void provisionLog(String conName,String topic,String actionType,String sourceId,String sourceName,String resultMessage,int instid) {
-		Message<?> resultMsg = JsonUtils.stringToObject(resultMessage, Message.class);
+		Message<?> resultMsg = null;
+		if(resultMessage != null) {
+			JsonUtils.stringToObject(resultMessage, Message.class);
+		}
 		String result = "success";
 		if(resultMsg == null || resultMsg.getCode() != 0) {
 			result = "fail";
diff --git a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java
index 30e11560..608d844f 100644
--- a/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java
+++ b/maxkey-persistence/src/main/java/org/maxkey/provision/thread/ProvisioningRunnerThread.java
@@ -17,8 +17,12 @@
 
 package org.maxkey.provision.thread;
 
-public class ProvisioningRunnerThread  extends Thread{
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+public class ProvisioningRunnerThread  extends Thread{
+	private static final Logger _logger = LoggerFactory.getLogger(ProvisioningRunnerThread.class);
+	
 	ProvisioningRunner runner;
 
 	public ProvisioningRunnerThread(ProvisioningRunner runner) {
@@ -31,9 +35,11 @@ public class ProvisioningRunnerThread  extends Thread{
 		while(true) {
 			try {
 				Thread.sleep(60 * 1000);
+				_logger.trace("Provisioning start ...");
 				runner.provisions();
+				_logger.trace("Provisioning end , wait for next .");
 			} catch (InterruptedException e) {
-				e.printStackTrace();
+				_logger.error("InterruptedException", e);
 			}
 		}
 	}
-- 
GitLab