From 000e185151a9e913e056bd227f08f438a7575576 Mon Sep 17 00:00:00 2001 From: Daniel <59575049+lumijiez@users.noreply.github.com> Date: Fri, 13 Dec 2024 00:47:18 +0200 Subject: [PATCH] working FTP --- .../java/io/github/lumijiez/FTPFetcher.java | 18 ++++++------- .../io/github/lumijiez/BrokerConnector.java | 1 + ...PClientConnector.java => FTPProducer.java} | 26 +++++++++---------- .../main/java/io/github/lumijiez/Main.java | 9 +++++-- 4 files changed, 30 insertions(+), 24 deletions(-) rename SymphonyProducer/src/main/java/io/github/lumijiez/{FTPClientConnector.java => FTPProducer.java} (79%) diff --git a/SymphonyManager/src/main/java/io/github/lumijiez/FTPFetcher.java b/SymphonyManager/src/main/java/io/github/lumijiez/FTPFetcher.java index 307a0a6..6fe613f 100644 --- a/SymphonyManager/src/main/java/io/github/lumijiez/FTPFetcher.java +++ b/SymphonyManager/src/main/java/io/github/lumijiez/FTPFetcher.java @@ -30,10 +30,10 @@ public class FTPFetcher { try { ftpClient.connect(ftpServer, ftpPort); - ftpClient.setControlKeepAliveTimeout(300); +// ftpClient.setControlKeepAliveTimeout(300); boolean login = ftpClient.login(ftpUser, ftpPass); if (!login) { - System.out.println("FTP login failed."); + Main.logger.error("FTP login failed."); return; } @@ -42,7 +42,7 @@ public class FTPFetcher { String[] fileNames = ftpClient.listNames(); if (fileNames == null || fileNames.length == 0) { - System.out.println("No files found in the directory."); + Main.logger.error("No files found in the directory."); return; } @@ -51,21 +51,21 @@ public class FTPFetcher { try (FileOutputStream fos = new FileOutputStream(localFile)) { boolean success = ftpClient.retrieveFile(fileName, fos); if (success) { - System.out.println("File downloaded: " + localFile.getName()); + Main.logger.info("File downloaded: {}", localFile.getName()); } else { - System.out.println("Failed to download the file: " + fileName); + Main.logger.error("Failed to download the file: {}", fileName); } } boolean deleted = ftpClient.deleteFile(fileName); if (deleted) { - System.out.println("File deleted from FTP server: " + fileName); + Main.logger.info("File deleted from FTP server: {}", fileName); } else { - System.out.println("Failed to delete the file from FTP server: " + fileName); + Main.logger.error("Failed to delete the file from FTP server: {}", fileName); } } } catch (IOException e) { - e.printStackTrace(); + Main.logger.error(e.getMessage()); } finally { try { if (ftpClient.isConnected()) { @@ -73,7 +73,7 @@ public class FTPFetcher { ftpClient.disconnect(); } } catch (IOException ex) { - ex.printStackTrace(); + Main.logger.error(ex.getMessage()); } } } diff --git a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java index 023cf88..a533a9b 100644 --- a/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java +++ b/SymphonyProducer/src/main/java/io/github/lumijiez/BrokerConnector.java @@ -93,6 +93,7 @@ public class BrokerConnector { } return hexString.toString(); } catch (NoSuchAlgorithmException e) { + Main.logger.error(e.getMessage()); throw new RuntimeException("SHA-256 algorithm not available", e); } } diff --git a/SymphonyProducer/src/main/java/io/github/lumijiez/FTPClientConnector.java b/SymphonyProducer/src/main/java/io/github/lumijiez/FTPProducer.java similarity index 79% rename from SymphonyProducer/src/main/java/io/github/lumijiez/FTPClientConnector.java rename to SymphonyProducer/src/main/java/io/github/lumijiez/FTPProducer.java index 0e43f1b..81f59d7 100644 --- a/SymphonyProducer/src/main/java/io/github/lumijiez/FTPClientConnector.java +++ b/SymphonyProducer/src/main/java/io/github/lumijiez/FTPProducer.java @@ -11,21 +11,21 @@ import java.util.Random; import java.util.Timer; import java.util.TimerTask; -public class FTPClientConnector { +public class FTPProducer { String ftpServer = "ftp_server"; int ftpPort = 21; String ftpUser = "symphony"; String ftpPass = "symphony"; String ftpDir = "/"; - FTPClientConnector() { + FTPProducer() { Timer timer = new Timer(); timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { uploadRandomJsonToFtp(ftpServer, ftpPort, ftpUser, ftpPass, ftpDir); } - }, 0, 30000); + }, 0, 5000); } public static void uploadRandomJsonToFtp(String ftpServer, int ftpPort, String ftpUser, String ftpPass, String ftpDir) { @@ -40,7 +40,7 @@ public class FTPClientConnector { ftpClient.connect(ftpServer, ftpPort); boolean login = ftpClient.login(ftpUser, ftpPass); if (!login) { - System.out.println("FTP login failed."); + Main.logger.error("FTP login failed."); return; } @@ -49,11 +49,11 @@ public class FTPClientConnector { String subDir = "uploads"; if (!ftpClient.changeWorkingDirectory(subDir)) { - System.out.println("Subdirectory does not exist. Creating: " + subDir); + Main.logger.info("Subdirectory does not exist. Creating: {}", subDir); boolean dirCreated = ftpClient.makeDirectory(subDir); if (!dirCreated) { - System.out.println("Failed to create subdirectory: " + subDir); - System.out.println("Server reply: " + ftpClient.getReplyString()); + Main.logger.error("Failed to create subdirectory: {}", subDir); + Main.logger.error("Server reply: {}", ftpClient.getReplyString()); return; } ftpClient.changeWorkingDirectory(subDir); @@ -62,16 +62,16 @@ public class FTPClientConnector { String filename = "file_" + System.currentTimeMillis() + ".json"; boolean uploaded = ftpClient.storeFile(filename, inputStream); if (uploaded) { - System.out.println("Successfully uploaded: " + filename); + Main.logger.info("Successfully uploaded: {}", filename); } else { - System.out.println("Failed to upload: " + filename); - System.out.println("Server reply: " + ftpClient.getReplyString()); + Main.logger.error("Failed to upload: {}", filename); + Main.logger.error("Server reply: {}", ftpClient.getReplyString()); } ftpClient.logout(); } catch (IOException e) { - System.out.println("Error during FTP operation: " + e.getMessage()); - e.printStackTrace(); + Main.logger.error("Error during FTP operation: {}", e.getMessage()); + Main.logger.error(e.getMessage()); } finally { try { inputStream.close(); @@ -79,7 +79,7 @@ public class FTPClientConnector { ftpClient.disconnect(); } } catch (IOException e) { - e.printStackTrace(); + Main.logger.error(e.getMessage()); } } } diff --git a/SymphonyProducer/src/main/java/io/github/lumijiez/Main.java b/SymphonyProducer/src/main/java/io/github/lumijiez/Main.java index 7a067c9..8ff6b3f 100644 --- a/SymphonyProducer/src/main/java/io/github/lumijiez/Main.java +++ b/SymphonyProducer/src/main/java/io/github/lumijiez/Main.java @@ -1,19 +1,24 @@ package io.github.lumijiez; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public class Main { + public static Logger logger = LogManager.getLogger(Main.class); + public static void main(String[] args) { Thread brokerThread = new Thread(BrokerConnector::connect); brokerThread.start(); - Thread ftpThread = new Thread(FTPClientConnector::new); + Thread ftpThread = new Thread(FTPProducer::new); ftpThread.start(); try { brokerThread.join(); ftpThread.join(); } catch (InterruptedException e) { - e.printStackTrace(); + Main.logger.error(e.getMessage()); } } } \ No newline at end of file