Final suggestions commit

aixigo · Jan 31, 2024 · 9aa65ce · 9aa65ce
1 parent 5b7365b
commit 9aa65ce
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/api/src/apps/routes.rs b/api/src/apps/routes.rs
@@ -37,6 +37,7 @@ use futures::StreamExt;
 use http_api_problem::{HttpApiProblem, StatusCode};
 use multimap::MultiMap;
 use regex::Regex;
+use rocket::http::hyper::header::CONTENT_DISPOSITION;
 use rocket::http::{RawStr, Status};
 use rocket::request::{FromRequest, Outcome, Request};
 use rocket::response::stream::{Event, EventStream};
@@ -221,21 +222,12 @@ async fn logs<'r>(
         .get_logs(&app_name, service_name, &since, &limit)
         .await?;
 
-    let content_disposition = if download {
-        format!(
-            "attachment; filename=\"{app_name}_{service_name}_{}.txt\"",
-            Utc::now().format("%Y%m%d_%H%M%S")
-        )
-    } else {
-        format!("inline")
-    };
-
     Ok(LogsResponse {
         log_chunk,
         app_name,
         service_name,
         limit,
-        content_disposition,
+        download,
     })
 }
 
@@ -327,7 +319,7 @@ pub struct LogsResponse<'a> {
     app_name: AppName,
     service_name: &'a str,
     limit: Option<usize>,
-    content_disposition: String,
+    download: bool,
 }
 
 #[derive(FromForm)]
@@ -376,10 +368,21 @@ impl<'r> Responder<'r, 'static> for LogsResponse<'r> {
             ),
         };
 
+        let content_dispositon_value = if self.download {
+            format!(
+                "attachment; filename=\"{}_{}_{}.txt\"",
+                self.app_name,
+                self.service_name,
+                Utc::now().format("%Y%m%d_%H%M%S")
+            )
+        } else {
+            format!("inline")
+        };
+
         let log_lines = log_chunk.log_lines();
         Response::build()
             .raw_header("Link", format!("<{}>;rel=next", next_logs_url))
-            .raw_header("Content-Disposition", self.content_disposition)
+            .raw_header(CONTENT_DISPOSITION.as_str(), content_dispositon_value)
             .sized_body(log_lines.len(), Cursor::new(log_lines.clone()))
             .ok()
     }

diff --git a/api/src/infrastructure/docker.rs b/api/src/infrastructure/docker.rs
@@ -786,7 +786,7 @@ impl Infrastructure for DockerInfrastructure {
         service_name: &'a str,
         from: &'a Option<DateTime<FixedOffset>>,
         limit: &'a Option<usize>,
-        stream: bool,
+        follow: bool,
     ) -> BoxStream<'a, Result<(DateTime<FixedOffset>, String), failure::Error>> {
         stream! {
             match self
@@ -810,10 +810,8 @@ impl Infrastructure for DockerInfrastructure {
                         log_options.since(since);
                     }
 
-                    if stream {
-                        log_options.follow(true);
-                    }
-
+                    log_options.follow(follow);
+
                     let logs = docker
                         .containers()
                         .get(&container.id)

diff --git a/api/src/infrastructure/dummy_infrastructure.rs b/api/src/infrastructure/dummy_infrastructure.rs
@@ -185,7 +185,7 @@ impl Infrastructure for DummyInfrastructure {
         service_name: &'a str,
         _from: &'a Option<DateTime<FixedOffset>>,
         _limit: &'a Option<usize>,
-        _stream: bool,
+        _follow: bool,
     ) -> BoxStream<'a, Result<(DateTime<FixedOffset>, String), failure::Error>> {
         Box::pin(stream::iter(
             vec![

diff --git a/api/src/infrastructure/infrastructure.rs b/api/src/infrastructure/infrastructure.rs
@@ -76,7 +76,7 @@ pub trait Infrastructure: Send + Sync {
         service_name: &'a str,
         from: &'a Option<DateTime<FixedOffset>>,
         limit: &'a Option<usize>,
-        stream: bool,
+        follow: bool,
     ) -> BoxStream<'a, Result<(DateTime<FixedOffset>, String), failure::Error>>;
 
     /// Changes the status of a service, for example, the service might me stopped or started.

diff --git a/api/src/infrastructure/kubernetes/infrastructure.rs b/api/src/infrastructure/kubernetes/infrastructure.rs
@@ -576,7 +576,7 @@ impl Infrastructure for KubernetesInfrastructure {
         service_name: &'a str,
         from: &'a Option<DateTime<FixedOffset>>,
         limit: &'a Option<usize>,
-        stream: bool,
+        follow: bool,
     ) -> BoxStream<'a, Result<(DateTime<FixedOffset>, String), failure::Error>> {
         let Some((_deployment, Some(pod))) =
             (match self.get_deployment_and_pod(app_name, service_name).await {
@@ -591,7 +591,7 @@ impl Infrastructure for KubernetesInfrastructure {
             let p = LogParams {
                 timestamps: true,
                 since_time: from.map(|from| from.with_timezone(&Utc)),
-                follow: stream,
+                follow,
                 ..Default::default()
             };
             let client = self.client().await?;