Skip to content
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

Jump to bottom

Use controller.host property instead of old controller.ip property #974

Merged
merged 1 commit into from
Jul 24, 2023
Merged

Use controller.host property instead of old controller.ip property #974

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
2 changes: 1 addition & 1 deletion ngrinder-controller/src/main/java/org/ngrinder/common/constant/ControllerConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public interface ControllerConstants {
String PROP_CONTROLLER_FRONT_PAGE_QNA_RSS = "controller.front_page_qna_rss";
String PROP_CONTROLLER_FRONT_PAGE_RESOURCES_MORE_URL = "controller.front_page_resources_more_url";
String PROP_CONTROLLER_HELP_URL = "controller.help_url";
String PROP_CONTROLLER_IP = "controller.ip";
String PROP_CONTROLLER_HOST = "controller.host";
String PROP_CONTROLLER_MAX_AGENT_PER_TEST = "controller.max_agent_per_test";
String PROP_CONTROLLER_MAX_CONCURRENT_TEST = "controller.max_concurrent_test";
String PROP_CONTROLLER_MAX_RUN_COUNT = "controller.max_run_count";
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-controller/src/main/java/org/ngrinder/infra/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public String getCurrentIP() {
if (cluster) {
return StringUtils.trimToEmpty(getClusterProperties().getProperty(PROP_CLUSTER_HOST));
} else {
return StringUtils.trimToEmpty(getControllerProperties().getProperty(PROP_CONTROLLER_IP));
return StringUtils.trimToEmpty(getControllerProperties().getProperty(PROP_CONTROLLER_HOST));
}
}

Expand Down
2 changes: 1 addition & 1 deletion ngrinder-controller/src/main/resources/controller-properties.map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ controller.monitor_port,13243,monitor.listen.port
controller.url,,ngrinder.http.url,http.url
controller.console_port_base,12000,ngrinder.console.portbase
controller.controller_port,16001,ngrinder.agent.control.port
controller.ip,,ngrinder.controller.ipaddress,ngrinder.controller.ip
controller.host,,controller.ip,ngrinder.controller.ipaddress,ngrinder.controller.ip
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh in system.conf, controller.host was being used since 2014.

controller.validation_timeout,100,ngrinder.validation.timeout
controller.enable_agent_auto_approval,true,
controller.enable_script_console,false,
Expand Down
2 changes: 1 addition & 1 deletion ngrinder-core/src/main/java/net/grinder/util/NetworkUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public static List<Integer> getAvailablePorts(String ip, int size, int from, int
if (!inetAddress.isReachable(MAX_REACHABLE_TIMEOUT)) {
processException(
"Can not check available ports because given local IP address '" + ip + "' is unreachable. " +
"Please check the `/etc/hosts` file or manually specify the local IP address in `${NGRINDER_HOME}/system.conf`."
"Specify controller.host property in `${NGRINDER_HOME}/system.conf`."
);
}
} catch (SecurityException | IOException e) {
Expand Down