Skip to content

Commit dc754d8

Browse files
refactor on coderabbit suggestions
1 parent 5855693 commit dc754d8

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

src/prism/logstream/mod.rs

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use chrono::Utc;
2424
use http::StatusCode;
2525
use serde::{Deserialize, Serialize};
2626
use serde_json::{json, Value};
27-
use tracing::{debug, error, warn};
27+
use tracing::warn;
2828

2929
use crate::{
3030
handlers::http::{
@@ -262,9 +262,15 @@ impl PrismDatasetRequest {
262262
let mut responses = Vec::new();
263263
for result in results {
264264
match result {
265-
Some(Ok(response)) => responses.push(response),
266-
Some(Err(err)) => return Err(err),
267-
None => {} // Skip unauthorized or not found streams
265+
Ok(Some(response)) => responses.push(response),
266+
Ok(None) => {
267+
warn!("Stream not found or unauthorized access");
268+
continue;
269+
}
270+
Err(err) => {
271+
warn!("error: {err}");
272+
continue;
273+
}
268274
}
269275
}
270276

@@ -275,21 +281,21 @@ impl PrismDatasetRequest {
275281
&self,
276282
stream: String,
277283
key: SessionKey,
278-
) -> Option<Result<PrismDatasetResponse, PrismLogstreamError>> {
284+
) -> Result<Option<PrismDatasetResponse>, PrismLogstreamError> {
279285
// Skip unauthorized streams
280286
if !self.is_authorized(&stream, &key) {
281-
return None;
287+
return Ok(None);
282288
}
283289

284290
// Skip streams that don't exist
285291
if !self.stream_exists(&stream).await {
286-
return None;
292+
return Ok(None);
287293
}
288294

289295
// Process stream data
290296
match get_prism_logstream_info(&stream).await {
291-
Ok(info) => Some(self.build_dataset_response(stream, info).await),
292-
Err(err) => Some(Err(err)),
297+
Ok(info) => Ok(Some(self.build_dataset_response(stream, info).await?)),
298+
Err(err) => Err(err),
293299
}
294300
}
295301

@@ -306,7 +312,7 @@ impl PrismDatasetRequest {
306312

307313
async fn stream_exists(&self, stream: &str) -> bool {
308314
if PARSEABLE.check_or_load_stream(stream).await {
309-
debug!("Stream not found: {stream}");
315+
warn!("Stream not found: {stream}");
310316
false
311317
} else {
312318
true

0 commit comments

Comments
 (0)