Skip to content

Update logger statement #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravikumar2026 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update logger statement #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ojp-jdbc-driver/src/main/java/org/openjproxy/grpc/client/HealthCheckConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package org.openjproxy.grpc.client;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;

import java.util.Properties;

/**
* Configuration for health check and connection redistribution in multinode deployments.
* Loads settings from ojp.properties.
*/
@Slf4j
public class HealthCheckConfig {

private static final Logger log = LoggerFactory.getLogger(HealthCheckConfig.class);

// Default values
private static final long DEFAULT_HEALTH_CHECK_INTERVAL_MS = 5000L; // 5 seconds
private static final long DEFAULT_HEALTH_CHECK_THRESHOLD_MS = 5000L; // 5 seconds
Expand Down
17 changes: 8 additions & 9 deletions ojp-server/src/main/java/org/openjproxy/grpc/server/utils/PropertyPlaceholderResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.openjproxy.grpc.server.utils;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down Expand Up @@ -31,8 +30,8 @@
* </pre>
* </p>
*/
@Slf4j
public class PropertyPlaceholderResolver {
private static final Logger logger = LoggerFactory.getLogger(PropertyPlaceholderResolver.class);

// Pattern to match ${property.name} placeholders
private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\$\\{([^}]+)\\}");
Expand Down Expand Up @@ -90,7 +89,7 @@ public static String resolvePlaceholders(String input) {
"The suffix after the prefix must be 1-200 characters.",
placeholder
);
logger.error(errorMsg);
log.error(errorMsg);
throw new SecurityException(errorMsg);
}

Expand All @@ -102,11 +101,11 @@ public static String resolvePlaceholders(String input) {
"Please set JVM property '-D%s=<value>' or environment variable '%s'",
placeholder, placeholder, propertyNameToEnvVar(placeholder)
);
logger.error(errorMsg);
log.error(errorMsg);
throw new IllegalArgumentException(errorMsg);
}

logger.debug("Resolved placeholder ${{{}}}: {} characters", placeholder, value.length());
log.debug("Resolved placeholder ${{{}}}: {} characters", placeholder, value.length());
// Escape backslashes and dollar signs in the replacement string for regex
matcher.appendReplacement(result, Matcher.quoteReplacement(value));
}
Expand Down Expand Up @@ -162,19 +161,19 @@ private static String resolveProperty(String propertyName) {
// First check JVM system properties
String value = System.getProperty(propertyName);
if (value != null) {
logger.debug("Resolved property '{}' from JVM system property", propertyName);
log.debug("Resolved property '{}' from JVM system property", propertyName);
return value;
}

// Then check environment variables (convert dots to underscores and uppercase)
String envKey = propertyNameToEnvVar(propertyName);
value = System.getenv(envKey);
if (value != null) {
logger.debug("Resolved property '{}' from environment variable '{}'", propertyName, envKey);
log.debug("Resolved property '{}' from environment variable '{}'", propertyName, envKey);
return value;
}

logger.debug("Property '{}' not found in system properties or environment variables", propertyName);
log.debug("Property '{}' not found in system properties or environment variables", propertyName);
return null;
}

Expand Down