From f70061bdb1fcb4f6ade931215894e66b7f59c65c Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Tue, 2 May 2023 15:26:15 +0530 Subject: [PATCH 1/5] [MINOR][Enhancement] Update PropertiesStorage.java --- .../main/java/com/cloud/agent/dao/impl/PropertiesStorage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java index a1db88c86c48..4628b4d0a913 100644 --- a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -92,11 +92,11 @@ public synchronized boolean configure(String name, Map params) { file = new File(path); try { if (!file.createNewFile()) { - s_logger.error("Unable to create _file: " + file.getAbsolutePath()); + s_logger.error("Unable to create _file: ".concat(file.getAbsolutePath())); return false; } } catch (IOException e) { - s_logger.error("Unable to create _file: " + file.getAbsolutePath(), e); + s_logger.error("Unable to create _file: ".concat(file.getAbsolutePath()), e); return false; } } From 5c5f69806c2997eab7331f74c0661929b1d2fd81 Mon Sep 17 00:00:00 2001 From: maheshnikam <55378196+nikam14@users.noreply.github.com> Date: Tue, 9 May 2023 14:21:06 +0530 Subject: [PATCH 2/5] changed to String.format --- .../main/java/com/cloud/agent/dao/impl/PropertiesStorage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java index 4628b4d0a913..1821a08bfd93 100644 --- a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -92,11 +92,11 @@ public synchronized boolean configure(String name, Map params) { file = new File(path); try { if (!file.createNewFile()) { - s_logger.error("Unable to create _file: ".concat(file.getAbsolutePath())); + s_logger.error(String.format("Unable to create _file: %s",file.getAbsolutePath())); return false; } } catch (IOException e) { - s_logger.error("Unable to create _file: ".concat(file.getAbsolutePath()), e); + s_logger.error(String.format("Unable to create _file: %s",file.getAbsolutePath()), e); return false; } } From 0434fb267254d5e10606f48566c26af8cf455187 Mon Sep 17 00:00:00 2001 From: dahn Date: Tue, 31 Oct 2023 15:56:58 +0100 Subject: [PATCH 3/5] Apply (trivial) suggestions from code review Co-authored-by: Daniel Augusto Veronezi Salvador <38945620+GutoVeronezi@users.noreply.github.com> --- .../main/java/com/cloud/agent/dao/impl/PropertiesStorage.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java index 1821a08bfd93..d23d2ee13bcc 100644 --- a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -92,11 +92,11 @@ public synchronized boolean configure(String name, Map params) { file = new File(path); try { if (!file.createNewFile()) { - s_logger.error(String.format("Unable to create _file: %s",file.getAbsolutePath())); + s_logger.error(String.format("Unable to create _file: %s", file.getAbsolutePath())); return false; } } catch (IOException e) { - s_logger.error(String.format("Unable to create _file: %s",file.getAbsolutePath()), e); + s_logger.error(String.format("Unable to create _file: %s", file.getAbsolutePath()), e); return false; } } From 4186baf1013096790521f3e4274a938484bcf3d9 Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 15 Nov 2023 16:06:46 +0100 Subject: [PATCH 4/5] Update agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java --- .../java/com/cloud/agent/dao/impl/PropertiesStorage.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java index d23d2ee13bcc..dcd8ce0f4dac 100644 --- a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -96,7 +96,10 @@ public synchronized boolean configure(String name, Map params) { return false; } } catch (IOException e) { - s_logger.error(String.format("Unable to create _file: %s", file.getAbsolutePath()), e); + s_logger.error(String.format("Unable to create file: %s", file.getAbsolutePath())); + if (s_logger.isDebugEnabled()) { + s_logger.bedug(String.format("IOException while trying to create file: %s", file.getAbsolutePath()), e); + } return false; } } From 76666bbd51ec642f8aa1c5b84f7979848724f902 Mon Sep 17 00:00:00 2001 From: dahn Date: Wed, 15 Nov 2023 16:07:53 +0100 Subject: [PATCH 5/5] Update agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java --- .../main/java/com/cloud/agent/dao/impl/PropertiesStorage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java index dcd8ce0f4dac..87610c29f345 100644 --- a/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java +++ b/agent/src/main/java/com/cloud/agent/dao/impl/PropertiesStorage.java @@ -98,7 +98,7 @@ public synchronized boolean configure(String name, Map params) { } catch (IOException e) { s_logger.error(String.format("Unable to create file: %s", file.getAbsolutePath())); if (s_logger.isDebugEnabled()) { - s_logger.bedug(String.format("IOException while trying to create file: %s", file.getAbsolutePath()), e); + s_logger.debug(String.format("IOException while trying to create file: %s", file.getAbsolutePath()), e); } return false; }