Skip to content

Commit 58ce7e5

Browse files
committed
[java] fix msedgedriver log level logic
1 parent fc3f6cc commit 58ce7e5

File tree

1 file changed

+23
-13
lines changed

1 file changed

+23
-13
lines changed

java/src/org/openqa/selenium/edge/EdgeDriverService.java

+23-13
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public static class Builder extends DriverService.Builder<
119119

120120
private final boolean disableBuildCheck = Boolean.getBoolean(EDGE_DRIVER_DISABLE_BUILD_CHECK);
121121
private boolean verbose = Boolean.getBoolean(EDGE_DRIVER_VERBOSE_LOG_PROPERTY);
122-
private String loglevel = System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY);
122+
private String logLevel = System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY);
123123
private boolean silent = Boolean.getBoolean(EDGE_DRIVER_SILENT_OUTPUT_PROPERTY);
124124
private String allowedListIps = System.getProperty(EDGE_DRIVER_ALLOWED_IPS_PROPERTY);
125125

@@ -150,15 +150,20 @@ public int score(Capabilities capabilities) {
150150
* @return A self reference.
151151
*/
152152
public EdgeDriverService.Builder withVerbose(boolean verbose) {
153-
this.verbose = verbose;
153+
if (verbose) {
154+
this.logLevel = "ALL";
155+
}
156+
this.verbose = false;
154157
return this;
155158
}
156159

157160
/**
158161
* Configures the driver server log level.
159162
*/
160-
public EdgeDriverService.Builder withLoglevel(String level) {
161-
this.loglevel = level;
163+
public EdgeDriverService.Builder withLoglevel(String logLevel) {
164+
this.verbose = false;
165+
this.silent = false;
166+
this.logLevel = logLevel;
162167
return this;
163168
}
164169

@@ -169,7 +174,10 @@ public EdgeDriverService.Builder withLoglevel(String level) {
169174
* @return A self reference.
170175
*/
171176
public EdgeDriverService.Builder withSilent(boolean silent) {
172-
this.silent = silent;
177+
if (silent) {
178+
this.logLevel = "OFF";
179+
}
180+
this.silent = false;
173181
return this;
174182
}
175183

@@ -202,19 +210,21 @@ protected List<String> createArgs() {
202210
}
203211
}
204212

213+
// If set in properties and not overwritten by method
214+
if (verbose) {
215+
withVerbose(true);
216+
}
217+
if (silent) {
218+
withSilent(true);
219+
}
220+
205221
List<String> args = new ArrayList<>();
206222
args.add(String.format("--port=%d", getPort()));
207223
if (getLogFile() != null) {
208224
args.add(String.format("--log-path=%s", getLogFile().getAbsolutePath()));
209225
}
210-
if (verbose) {
211-
args.add("--verbose");
212-
}
213-
if (silent) {
214-
args.add("--silent");
215-
}
216-
if (loglevel != null) {
217-
args.add(String.format("--log-level=%s", loglevel));
226+
if (logLevel != null) {
227+
args.add(String.format("--log-level=%s", logLevel));
218228
}
219229
if (allowedListIps != null) {
220230
args.add(String.format("--whitelisted-ips=%s", allowedListIps));

0 commit comments

Comments
 (0)