Monitoring alert log file by server os in AlertLogMonitoring menu

Author: Dokyeongyun

src/main/java/root/core/repository/implement/WindowServerMonitoringRepository.java

@@ -58,7 +58,6 @@ public String checkAlertLog(AlertLogCommand alc) {
 		} catch (Exception e) {
 			log.error(e.getMessage());
 		}
-
 		log.debug(alc.toString());
 		return result;
 	}
@@ -85,22 +84,34 @@ public AlertLog checkAlertLogDuringPeriod(AlertLogCommand alc, String startDate,
 
 			for (int i = 0; i < lines.length; i++) {
 				String line = lines[i];
+				
 				// 조회시작일자 찾기
 				if (!isStartDate) {
 					LocalDate parsedDate = DateUtils.parse(line);
 					if (parsedDate != null) {
+						// [조회시작일자 >= 최초 로그기록일자]일 때, 최초 로그기록일자부터 읽기 시작
 						String parsedDateString = DateUtils.convertDateFormat("yyyy-MM-dd", parsedDate);
 						if (DateUtils.getDateDiffTime("yyyy-MM-dd", parsedDateString, startDate) >= 0) {
 							isStartDate = true;
 							readStartIndex = i;
+							logTimeStamp = line;
+
+							// [조회종료일자 > 조회 시작일자 >= 최초 로그기록일자]일 때 최초 로그기록일자부터 읽기 시작
+							if(DateUtils.getDateDiffTime("yyyy-MM-dd", parsedDateString, endDate) > 0) {
+								isEndDate = true;
+								readEndIndex = i;
+								break;
+							}
 						}
 					}
 				}
-
+				
 				// 로그 저장 시작 & 조회종료일자 찾기
 				if (isStartDate) {
 					LocalDate parsedDate = DateUtils.parse(line);
 					if (parsedDate != null) { // Log TimeStamp Line
+
+						// 현재 로그기록일자가 조회종료일자 + 1일인지 확인
 						String logDate = DateUtils.convertDateFormat("yyyy-MM-dd", parsedDate);
 						if (logDate.startsWith(DateUtils.addDate(endDate, 0, 0, 1))) {
 							isEndDate = true;
@@ -111,7 +122,7 @@ public AlertLog checkAlertLogDuringPeriod(AlertLogCommand alc, String startDate,
 							logTimeStamp = line;
 						}
 
-						if (i != readStartIndex && !isEndDate) {
+						if (i != readStartIndex) {
 							alertLog.addLog(new Log(logTimeStamp, logContents));
 							logContents = new ArrayList<>();
 							logTimeStamp = line;
@@ -129,8 +140,7 @@ public AlertLog checkAlertLogDuringPeriod(AlertLogCommand alc, String startDate,
 				}
 			}
 
-			// 종료 후 마지막 로그 추가하기
-			alertLog.addLog(new Log(logTimeStamp, logContents));
+			// 종료 후 fullLogString 추가
 			alertLog.setFullLogString(sb.toString());
 
 			log.info("\t▶ Alert Log READ LINE: " + (readEndIndex - readStartIndex) + "/" + alc.getReadLine());

src/main/java/root/core/usecase/implement/ServerMonitoringUsecaseImpl.java

@@ -268,7 +268,6 @@ public List<OSDiskUsage> getCurrentOSDiskUsage() {
 	public AlertLog getAlertLogDuringPeriod(AlertLogCommand alc, String startDate, String endDate) {
 		log.debug(String.format("alert log file monitoring, %s (%s ~ %s)", alc.getReadFilePath(), startDate, endDate));
 		AlertLog result = serverCheckRepository.checkAlertLogDuringPeriod(alc, startDate, endDate);
-		log.debug(result.toString());
 		return result;
 	}
 }

src/main/java/root/javafx/Controller/AlertLogMonitoringMenuController.java

@@ -19,10 +19,12 @@
 import root.core.domain.AlertLog;
 import root.core.domain.JschConnectionInfo;
 import root.core.domain.Log;
+import root.core.domain.enums.ServerOS;
 import root.core.repository.constracts.ServerMonitoringRepository;
 import root.core.repository.implement.LinuxServerMonitoringRepository;
 import root.core.repository.implement.PropertyRepositoryImpl;
 import root.core.repository.implement.ReportFileRepo;
+import root.core.repository.implement.WindowServerMonitoringRepository;
 import root.core.service.contracts.PropertyService;
 import root.core.service.implement.FilePropertyService;
 import root.core.usecase.constracts.ServerMonitoringUsecase;
@@ -170,7 +172,7 @@ private boolean validateInput() {
 		return true;
 	}
 
-	public void monitoringAlertLog(ActionEvent e) {
+	public void monitoringAlertLog(ActionEvent e) throws Exception {
 		// 입력값 검사
 		if (!validateInput()) {
 			return;
@@ -184,7 +186,14 @@ public void monitoringAlertLog(ActionEvent e) {
 
 		JschServer server = new JschServer(connInfo);
 		server.init();
-		ServerMonitoringRepository repo = new LinuxServerMonitoringRepository(server);
+		ServerMonitoringRepository repo = null;
+		if (connInfo.getServerOS() == ServerOS.WINDOW) {
+			repo = new WindowServerMonitoringRepository(server);
+		} else if (connInfo.getServerOS() == ServerOS.LINUX) {
+			repo = new LinuxServerMonitoringRepository(server);
+		} else {
+			throw new Exception("Server OS is not valid");
+		}
 		ServerMonitoringUsecase usecase = new ServerMonitoringUsecaseImpl(repo, ReportFileRepo.getInstance());
 
 		alertLogMonitoringResultMap.put(selectedServer,