Add port option

Author: trueleo

server/src/handlers/livetail.rs

@@ -1,4 +1,4 @@
-use std::net::{Ipv4Addr, SocketAddrV4};
+use std::net::SocketAddr;
 
 use arrow_flight::encode::FlightDataEncoderBuilder;
 use cookie::Cookie;
@@ -21,6 +21,7 @@ use tower_http::cors::{Any, CorsLayer};
 
 use crate::livetail::{Message, LIVETAIL};
 use crate::metadata::STREAM_INFO;
+use crate::option::CONFIG;
 use crate::rbac::map::SessionKey;
 use crate::rbac::{self, Users};
 use crate::utils;
@@ -143,7 +144,13 @@ impl FlightService for FlightServiceImpl {
 }
 
 pub fn server() -> impl Future<Output = Result<(), Box<dyn std::error::Error + Send>>> + Send {
-    let addr = SocketAddrV4::new(Ipv4Addr::new(127, 0, 0, 1), 7000);
+    let mut addr: SocketAddr = CONFIG
+        .parseable
+        .address
+        .parse()
+        .expect("valid socket address");
+    addr.set_port(CONFIG.parseable.livetail_port);
+
     let service = FlightServiceImpl {};
 
     let svc = FlightServiceServer::new(service);
@@ -160,7 +167,7 @@ pub fn server() -> impl Future<Output = Result<(), Box<dyn std::error::Error + S
         .layer(cors)
         .layer(GrpcWebLayer::new())
         .add_service(svc)
-        .serve(std::net::SocketAddr::V4(addr))
+        .serve(addr)
         .map_err(|err| Box::new(err) as Box<dyn std::error::Error + Send>)
 }
 

server/src/option.rs

@@ -196,6 +196,9 @@ pub struct Server {
     /// Open AI access key
     pub open_ai_key: Option<String>,
 
+    /// Livetail port
+    pub livetail_port: u16,
+
     /// Rows in Parquet Rowgroup
     pub row_group_size: usize,
 
@@ -250,6 +253,10 @@ impl FromArgMatches for Server {
             .cloned()
             .expect("default for send analytics");
         self.open_ai_key = m.get_one::<String>(Self::OPEN_AI_KEY).cloned();
+        self.livetail_port = m
+            .get_one::<u16>(Self::LIVETAIL_PORT)
+            .cloned()
+            .expect("default for livetail port");
         // converts Gib to bytes before assigning
         self.query_memory_pool_size = m
             .get_one::<u8>(Self::QUERY_MEM_POOL_SIZE)
@@ -314,6 +321,7 @@ impl Server {
     pub const OPENID_CLIENT_ID: &str = "oidc-client";
     pub const OPENID_CLIENT_SECRET: &str = "oidc-client-secret";
     pub const OPENID_ISSUER: &str = "oidc-issuer";
+    pub const LIVETAIL_PORT: &str = "livetail-port";
     // todo : what should this flag be
     pub const QUERY_MEM_POOL_SIZE: &str = "query-mempool-size";
     pub const ROW_GROUP_SIZE: &str = "row-group-size";
@@ -457,6 +465,16 @@ impl Server {
                     .value_parser(validation::url)
                     .help("Set host global domain address"),
             )
+            .arg(
+                Arg::new(Self::LIVETAIL_PORT)
+                    .long(Self::LIVETAIL_PORT)
+                    .env("P_FLIGHT_PORT")
+                    .value_name("PORT")
+                    .default_value("8001")
+                    .required(false)
+                    .value_parser(value_parser!(u16))
+                    .help("Set port for livetail arrow flight server"),
+            )
             .arg(
                 Arg::new(Self::QUERY_MEM_POOL_SIZE)
                     .long(Self::QUERY_MEM_POOL_SIZE)