From 323138b260520cc9cacd64d087d732744d12d4a5 Mon Sep 17 00:00:00 2001
From: "fabio.formosa" <fabio.formosa@gmail.com>
Date: Sun, 6 Nov 2016 13:01:20 +0100
Subject: [PATCH] Added thread name in log record

---
 .../controllers/SchedulerController.java      | 24 +++++++------------
 .../jobs/AbstractLoggingJob.java              |  4 ++--
 .../jobs/entities/LogRecord.java              | 12 ++++++++--
 .../app/components/progress/logs-directive.js |  1 +
 .../templates/manager/logs-panel.html         | 11 ++++++---
 5 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java
index c55d22d..dfbba49 100644
--- a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java
+++ b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java
@@ -26,8 +26,7 @@ public class SchedulerController {
 	private static final int MILLS_IN_A_DAY = 1000 * 60 * 60 * 24;
 	private static final int SEC_IN_A_DAY = 60 * 60 * 24;
 
-	private final Logger log = LoggerFactory
-			.getLogger(SchedulerController.class);
+	private final Logger log = LoggerFactory.getLogger(SchedulerController.class);
 
 	@Resource
 	private Scheduler scheduler;
@@ -53,16 +52,14 @@ public class SchedulerController {
 		SchedulerConfigParam config = new SchedulerConfigParam();
 		config.setMaxCount(jobTrigger.getRepeatCount() + 1);
 		long repeatIntervalInMills = jobTrigger.getRepeatInterval();
-		config.setTriggerPerDay(
-				fromMillsIntervalToTriggerPerDay(repeatIntervalInMills));
+		config.setTriggerPerDay(fromMillsIntervalToTriggerPerDay(repeatIntervalInMills));
 		return config;
 	}
 
 	@RequestMapping("/progress")
 	public TriggerProgress getProgressInfo() throws SchedulerException {
 
-		SimpleTriggerImpl jobTrigger = ((SimpleTriggerImpl) scheduler
-				.getTrigger(this.jobTrigger.getKey()));
+		SimpleTriggerImpl jobTrigger = ((SimpleTriggerImpl) scheduler.getTrigger(this.jobTrigger.getKey()));
 
 		TriggerProgress progress = new TriggerProgress();
 		if (jobTrigger != null && jobTrigger.getJobKey() != null) {
@@ -83,19 +80,14 @@ public class SchedulerController {
 	}
 
 	@RequestMapping(value = "/config", method = RequestMethod.POST)
-	public SchedulerConfigParam postConfig(
-			@RequestBody SchedulerConfigParam config)
+	public SchedulerConfigParam postConfig(@RequestBody SchedulerConfigParam config)
 			throws SchedulerException {
 
-		TriggerBuilder<SimpleTrigger> triggerBuilder = jobTrigger
-				.getTriggerBuilder();
+		TriggerBuilder<SimpleTrigger> triggerBuilder = jobTrigger.getTriggerBuilder();
 
-		int intervalInSeconds = fromTriggerPerDayToMillSecInterval(
-				config.getTriggerPerDay());
-		Trigger newTrigger = triggerBuilder
-				.withSchedule(SimpleScheduleBuilder.simpleSchedule()
-						.withIntervalInMilliseconds(intervalInSeconds)
-						.withRepeatCount(config.getMaxCount() - 1))
+		int intervalInSeconds = fromTriggerPerDayToMillSecInterval(config.getTriggerPerDay());
+		Trigger newTrigger = triggerBuilder.withSchedule(SimpleScheduleBuilder.simpleSchedule()
+				.withIntervalInMilliseconds(intervalInSeconds).withRepeatCount(config.getMaxCount() - 1))
 				.build();
 
 		scheduler.rescheduleJob(jobTrigger.getKey(), newTrigger);
diff --git a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractLoggingJob.java b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractLoggingJob.java
index f097858..5526f1c 100644
--- a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractLoggingJob.java
+++ b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractLoggingJob.java
@@ -15,8 +15,7 @@ import it.fabioformosa.quartzmanager.jobs.entities.LogRecord;
 
 public abstract class AbstractLoggingJob implements Job {
 
-	private static final Logger log = LoggerFactory
-			.getLogger(AbstractLoggingJob.class);
+	private static final Logger log = LoggerFactory.getLogger(AbstractLoggingJob.class);
 
 	@Autowired
 	private SimpMessageSendingOperations messagingTemplate;
@@ -44,6 +43,7 @@ public abstract class AbstractLoggingJob implements Job {
 
 	public void logAndSend(LogRecord logRecord) {
 		log.info(logRecord.getMessage());
+		logRecord.setThreadName(Thread.currentThread().getName());
 		messagingTemplate.convertAndSend("/topic/logs", logRecord);
 	}
 
diff --git a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java
index 2073691..d4aaba8 100644
--- a/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java
+++ b/quartz-manager/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java
@@ -12,6 +12,7 @@ public class LogRecord {
 	private LogType type;
 
 	private String message;
+	private String threadName;
 
 	public LogRecord(LogType type, String msg) {
 		super();
@@ -28,6 +29,10 @@ public class LogRecord {
 		return message;
 	}
 
+	public String getThreadName() {
+		return threadName;
+	}
+
 	public LogType getType() {
 		return type;
 	}
@@ -40,14 +45,17 @@ public class LogRecord {
 		message = msg;
 	}
 
+	public void setThreadName(String threadName) {
+		this.threadName = threadName;
+	}
+
 	public void setType(LogType type) {
 		this.type = type;
 	}
 
 	@Override
 	public String toString() {
-		return "LogRecord [date=" + date + ", type=" + type + ", message="
-				+ message + "]";
+		return "LogRecord [date=" + date + ", type=" + type + ", message=" + message + "]";
 	}
 
 }
diff --git a/quartz-manager/src/main/resources/static/js/app/components/progress/logs-directive.js b/quartz-manager/src/main/resources/static/js/app/components/progress/logs-directive.js
index e16abdc..3493948 100644
--- a/quartz-manager/src/main/resources/static/js/app/components/progress/logs-directive.js
+++ b/quartz-manager/src/main/resources/static/js/app/components/progress/logs-directive.js
@@ -25,6 +25,7 @@ angular.module('progress')
 				logItem.time = logRecord.date;
 				logItem.type = logRecord.type;
 				logItem.msg = logRecord.message;
+				logItem.threadName = logRecord.threadName;
 				
 				$scope.logs.unshift(logItem);
 			})
diff --git a/quartz-manager/src/main/resources/templates/manager/logs-panel.html b/quartz-manager/src/main/resources/templates/manager/logs-panel.html
index f0f8892..5e9434a 100644
--- a/quartz-manager/src/main/resources/templates/manager/logs-panel.html
+++ b/quartz-manager/src/main/resources/templates/manager/logs-panel.html
@@ -1,16 +1,21 @@
 <div id="logs">
 	 <div class="row" data-ng-repeat="log in logs">
-	  	<div class="col-xs-3">
+	  	<div class="col-xs-2">
 	  		<span data-ng-class="{'animated zoomIn firstLog': $first}"> [{{log.time|date:'medium'}}]</span>
 	  	</div>
-	  	<div class="col-xs-2">
+	  	<div class="col-xs-1">
 	  		<span data-ng-class="{'animated zoomIn firstLog': $first}">
 	  		  <i data-ng-class="{'fa fa-check-circle green': log.type == 'INFO',
 	  		  					  'fa fa-exclamation-triangle dark-yellow': log.type == 'WARN',	
 	  		  					 'fa fa-times-circle red': log.type == 'ERROR'}"></i>	  		  
 	  		 </span>
 	  	</div>
-	  	<div class="col-xs-7">
+	  	<div class="col-xs-3">
+	  		<span data-ng-class="{'animated zoomIn firstLog': $first}">
+	  		  {{log.threadName}}		  
+	  		 </span>
+	  	</div>
+	  	<div class="col-xs-6">
 	  		<span data-ng-class="{'animated zoomIn firstLog': $first}"> {{log.msg}}</span>
 	  	</div>
 	 </div>