Skip to content

Commit c7e2b55

Browse files
committed
[rust] Log error message as debug trace when parsing version
1 parent 4dd9e1f commit c7e2b55

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed

rust/src/chrome.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,11 @@ impl SeleniumManager for ChromeManager {
192192
"Reading {} version from {}",
193193
&self.driver_name, driver_url
194194
));
195-
match read_version_from_link(self.get_http_client(), driver_url) {
195+
match read_version_from_link(
196+
self.get_http_client(),
197+
driver_url,
198+
self.get_logger(),
199+
) {
196200
Ok(version) => {
197201
driver_version = version;
198202
break;

rust/src/downloads.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,12 @@ pub async fn download_driver_to_tmp_folder(
6565
Ok((tmp_dir, target_path))
6666
}
6767

68-
pub fn read_version_from_link(http_client: &Client, url: String) -> Result<String, Box<dyn Error>> {
69-
parse_version(read_content_from_link(http_client, url)?)
68+
pub fn read_version_from_link(
69+
http_client: &Client,
70+
url: String,
71+
log: &Logger,
72+
) -> Result<String, Box<dyn Error>> {
73+
parse_version(read_content_from_link(http_client, url)?, log)
7074
}
7175

7276
#[tokio::main]
@@ -81,6 +85,10 @@ pub async fn read_content_from_link(
8185
pub async fn read_redirect_from_link(
8286
http_client: &Client,
8387
url: String,
88+
log: &Logger,
8489
) -> Result<String, Box<dyn Error>> {
85-
parse_version(http_client.get(&url).send().await?.url().path().to_string())
90+
parse_version(
91+
http_client.get(&url).send().await?.url().path().to_string(),
92+
log,
93+
)
8694
}

rust/src/edge.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ impl SeleniumManager for EdgeManager {
192192
"Reading {} version from {}",
193193
&self.driver_name, driver_url
194194
));
195-
let driver_version = read_version_from_link(self.get_http_client(), driver_url)?;
195+
let driver_version =
196+
read_version_from_link(self.get_http_client(), driver_url, self.get_logger())?;
196197

197198
if !browser_version.is_empty() {
198199
metadata.drivers.push(create_driver_metadata(

rust/src/files.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,9 @@ pub fn get_binary_extension(os: &str) -> &str {
179179
}
180180
}
181181

182-
pub fn parse_version(version_text: String) -> Result<String, Box<dyn Error>> {
182+
pub fn parse_version(version_text: String, log: &Logger) -> Result<String, Box<dyn Error>> {
183183
if version_text.to_ascii_lowercase().contains("error") {
184+
log.debug(format!("Error parsing version: {}", version_text));
184185
return Err(PARSE_ERROR.into());
185186
}
186187
let mut parsed_version = "".to_string();

rust/src/firefox.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ impl SeleniumManager for FirefoxManager {
178178
}
179179
_ => {
180180
let latest_url = format!("{}{}", DRIVER_URL, LATEST_RELEASE);
181-
let driver_version = read_redirect_from_link(self.get_http_client(), latest_url)?;
181+
let driver_version =
182+
read_redirect_from_link(self.get_http_client(), latest_url, self.get_logger())?;
182183

183184
if !browser_version.is_empty() {
184185
metadata.drivers.push(create_driver_metadata(

rust/src/iexplorer.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,10 @@ impl SeleniumManager for IExplorerManager {
134134

135135
let index_release =
136136
driver_url.rfind(IEDRIVER_RELEASE).unwrap() + IEDRIVER_RELEASE.len();
137-
let driver_version =
138-
parse_version(driver_url.as_str()[index_release..].to_string())?;
137+
let driver_version = parse_version(
138+
driver_url.as_str()[index_release..].to_string(),
139+
self.get_logger(),
140+
)?;
139141

140142
if !browser_version.is_empty() {
141143
metadata.drivers.push(create_driver_metadata(

rust/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ pub trait SeleniumManager {
170170
Ok(out) => out,
171171
Err(_e) => continue,
172172
};
173-
let full_browser_version = parse_version(output).unwrap_or_default();
173+
let full_browser_version =
174+
parse_version(output, self.get_logger()).unwrap_or_default();
174175
if full_browser_version.is_empty() {
175176
continue;
176177
}
@@ -254,7 +255,7 @@ pub trait SeleniumManager {
254255
.run_shell_command_with_log(format_one_arg(DASH_DASH_VERSION, self.get_driver_name()))
255256
{
256257
Ok(output) => {
257-
let parsed_version = parse_version(output).unwrap_or_default();
258+
let parsed_version = parse_version(output, self.get_logger()).unwrap_or_default();
258259
if !parsed_version.is_empty() {
259260
let which_command = if WINDOWS.is(self.get_os()) {
260261
WHERE_COMMAND

0 commit comments

Comments
 (0)