Skip to content

Commit da8c4bf

Browse files
committed
improve java error handling
1 parent 1cada6a commit da8c4bf

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

tmc-langs-java/src/maven.rs

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,9 @@ impl LanguagePlugin for MavenPlugin {
113113
.output()
114114
.map_err(|e| JavaError::FailedToRun("mvn".to_string(), e))?;
115115

116-
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
117-
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
118-
119116
if !output.status.success() {
117+
log::warn!("stdout: {}", String::from_utf8_lossy(&output.stdout));
118+
log::warn!("stderr: {}", String::from_utf8_lossy(&output.stderr));
120119
return Err(JavaError::FailedCommand(
121120
"mvn".to_string(),
122121
output.status,
@@ -126,6 +125,9 @@ impl LanguagePlugin for MavenPlugin {
126125
.into());
127126
}
128127

128+
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
129+
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
130+
129131
Ok(())
130132
}
131133

@@ -162,10 +164,9 @@ impl JavaPlugin for MavenPlugin {
162164
JavaError::FailedToRun(mvn_path.as_os_str().to_string_lossy().to_string(), e)
163165
})?;
164166

165-
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
166-
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
167-
168167
if !output.status.success() {
168+
log::warn!("stdout: {}", String::from_utf8_lossy(&output.stdout));
169+
log::warn!("stderr: {}", String::from_utf8_lossy(&output.stderr));
169170
return Err(JavaError::FailedCommand(
170171
mvn_path.as_os_str().to_string_lossy().to_string(),
171172
output.status,
@@ -174,6 +175,9 @@ impl JavaPlugin for MavenPlugin {
174175
));
175176
}
176177

178+
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
179+
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
180+
177181
let class_path = fs::read_to_string(&class_path_file)
178182
.map_err(|e| JavaError::FileRead(class_path_file, e))?;
179183
if class_path.is_empty() {
@@ -205,10 +209,9 @@ impl JavaPlugin for MavenPlugin {
205209
JavaError::FailedToRun(mvn_path.as_os_str().to_string_lossy().to_string(), e)
206210
})?;
207211

208-
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
209-
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
210-
211212
if !output.status.success() {
213+
log::warn!("stdout: {}", String::from_utf8_lossy(&output.stdout));
214+
log::warn!("stderr: {}", String::from_utf8_lossy(&output.stderr));
212215
return Err(JavaError::FailedCommand(
213216
mvn_path.as_os_str().to_string_lossy().to_string(),
214217
output.status,
@@ -217,6 +220,9 @@ impl JavaPlugin for MavenPlugin {
217220
));
218221
}
219222

223+
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
224+
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
225+
220226
Ok(CompileResult {
221227
status_code: output.status,
222228
stdout: output.stdout,
@@ -240,10 +246,9 @@ impl JavaPlugin for MavenPlugin {
240246
JavaError::FailedToRun(mvn_path.as_os_str().to_string_lossy().to_string(), e)
241247
})?;
242248

243-
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
244-
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
245-
246249
if !output.status.success() {
250+
log::warn!("stdout: {}", String::from_utf8_lossy(&output.stdout));
251+
log::warn!("stderr: {}", String::from_utf8_lossy(&output.stderr));
247252
return Err(JavaError::FailedCommand(
248253
mvn_path.as_os_str().to_string_lossy().to_string(),
249254
output.status,
@@ -252,6 +257,9 @@ impl JavaPlugin for MavenPlugin {
252257
));
253258
}
254259

260+
log::trace!("stdout: {}", String::from_utf8_lossy(&output.stdout));
261+
log::debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
262+
255263
Ok(TestRun {
256264
test_results: path.join("target/test_output.txt"),
257265
stdout: output.stdout,

0 commit comments

Comments
 (0)