Merge pull request #187 from code0-tech/186-configurable-grpc-host

Configurable grpc host

Author: raphael-goetz

.env

@@ -1,5 +1,10 @@
-REDIS_URL='redis://localhost:6379'
 ENVIRONMENT='development'
 MODE='static'
+NATS_URL='nats://localhost:4222'
+NATS_BUCKET='flow_store'
 RUNTIME_TOKEN="<token>"
-FLOW_FALLBACK_PATH='./flow/test_flow_one.json'
+FLOW_FALLBACK_PATH='../flow/test_flow_one.json'
+GRPC_HOST='127.0.0.1'
+GRPC_PORT=8081
+WITH_HEALTH_SERVICE=false
+SAGITTARIUS_URL='http://localhost:50051'

.env-example

@@ -1,5 +1,15 @@
-REDIS_URL='redis://localhost:6379'
-ENVIRONMENT='development'
-MODE='static'
+ENVIRONMENT='production'
+MODE='dynamic'
+
+NATS_URL='nats://localhost:4222'
+NATS_BUCKET='flow_store'
+
 RUNTIME_TOKEN="<token>"
-FLOW_FALLBACK_PATH='../flow/test_flow_one.json'
+FLOW_FALLBACK_PATH='./path/to/flow.json'
+
+GRPC_HOST='127.0.0.1'
+GRPC_PORT=50051
+
+WITH_HEALTH_SERVICE=false
+
+SAGITTARIUS_URL='http://localhost:50051'

docker-compose.yml

@@ -32,7 +32,13 @@ pub struct Config {
     /// URL to the `Sagittarius` Server.
     pub backend_url: String,
 
+    // Port of the `Aquila` Server
     pub grpc_port: u16,
+
+    // Host of the `Aquila` Server
+    pub grpc_host: String,
+
+    pub with_health_service: bool,
 }
 
 /// Implementation for all relevant `Aquila` startup configurations
@@ -57,8 +63,10 @@ impl Config {
                 String::from("../flow/test_flow_one.json"),
             ),
             grpc_port: env_with_default("GRPC_PORT", 8081),
+            grpc_host: env_with_default("GRPC_HOST", String::from("127.0.0.1")),
+            with_health_service: env_with_default("WITH_HEALTH_SERVICE", false),
             runtime_token: env_with_default("RUNTIME_TOKEN", String::from("default_session_token")),
-            backend_url: env_with_default("BACKEND_URL", String::from("http://localhost:8080")),
+            backend_url: env_with_default("SAGITTARIUS_URL", String::from("http://localhost:50051")),
         }
     }
 

src/.env

@@ -27,11 +27,12 @@ pub struct AquilaGRPCServer {
     sagittarius_url: String,
     nats_url: String,
     address: SocketAddr,
+    with_health_service: bool,
 }
 
 impl AquilaGRPCServer {
     pub fn new(config: &Config) -> Self {
-        let address = match format!("127.0.0.1:{}", config.grpc_port).parse() {
+        let address = match format!("{}:{}", config.grpc_host, config.grpc_port).parse() {
             Ok(addr) => {
                 info!("Listening on {:?}", &addr);
                 addr
@@ -43,55 +44,61 @@ impl AquilaGRPCServer {
             token: config.runtime_token.clone(),
             sagittarius_url: config.backend_url.clone(),
             nats_url: config.nats_url.clone(),
+            with_health_service: config.with_health_service,
             address,
         }
     }
 
-    pub async fn start(&self) -> std::result::Result<(), tonic::transport::Error> {
+    pub async fn start(&self) -> Result<(), tonic::transport::Error> {
         let data_type_service = SagittariusDataTypeServiceClient::new_arc(
             self.sagittarius_url.clone(),
             self.token.clone(),
         )
         .await;
 
-        log::info!("DataTypeService started");
+        info!("DataTypeService started");
 
         let flow_type_service = SagittariusFlowTypeServiceClient::new_arc(
             self.sagittarius_url.clone(),
             self.token.clone(),
         )
         .await;
 
-        log::info!("FlowTypeService started");
+        info!("FlowTypeService started");
 
         let runtime_function_service = SagittariusRuntimeFunctionServiceClient::new_arc(
             self.sagittarius_url.clone(),
             self.token.clone(),
         )
         .await;
 
-        log::info!("RuntimeFunctionService started");
-
-        let health_service = code0_flow::flow_health::HealthService::new(self.nats_url.clone());
-        log::info!("HealthService started");
+        info!("RuntimeFunctionService started");
 
         let data_type_server = AquilaDataTypeServiceServer::new(data_type_service.clone());
         let flow_type_server = AquilaFlowTypeServiceServer::new(flow_type_service.clone());
         let runtime_function_server =
             AquilaRuntimeFunctionServiceServer::new(runtime_function_service.clone());
 
-        log::info!("Starting gRPC Server...");
+        info!("Starting gRPC Server...");
+
+        if self.with_health_service {
+            info!("Starting with HealthService");
+            let health_service = code0_flow::flow_health::HealthService::new(self.nats_url.clone());
 
-        Server::builder()
-            .add_service(tonic_health::pb::health_server::HealthServer::new(
-                health_service,
-            ))
-            .add_service(DataTypeServiceServer::new(data_type_server))
-            .add_service(FlowTypeServiceServer::new(flow_type_server))
-            .add_service(RuntimeFunctionDefinitionServiceServer::new(
-                runtime_function_server,
-            ))
-            .serve(self.address)
-            .await
+            Server::builder()
+                .add_service(tonic_health::pb::health_server::HealthServer::new(health_service))
+                .add_service(DataTypeServiceServer::new(data_type_server))
+                .add_service(FlowTypeServiceServer::new(flow_type_server))
+                .add_service(RuntimeFunctionDefinitionServiceServer::new(runtime_function_server))
+                .serve(self.address)
+                .await
+        } else {
+
+            Server::builder()
+                .add_service(DataTypeServiceServer::new(data_type_server))
+                .add_service(FlowTypeServiceServer::new(flow_type_server))
+                .add_service(RuntimeFunctionDefinitionServiceServer::new(runtime_function_server)).serve(self.address)
+                .await
+        }
     }
 }