diff --git a/src/data.rs b/src/data.rs index cc0c8fc..bac98dd 100644 --- a/src/data.rs +++ b/src/data.rs @@ -383,10 +383,10 @@ impl BrainData { && n.avail_vcpus >= filters.vcpus && n.avail_mem_mb >= filters.memory_mb && n.avail_storage_gbs >= filters.storage_gb - && (!filters.country.is_empty() && (n.country == filters.country)) - && (!filters.city.is_empty() && (n.city == filters.city)) - && (!filters.region.is_empty() && (n.region == filters.region)) - && (!filters.ip.is_empty() && (n.ip == filters.ip)) + && (filters.country.is_empty() || (n.country == filters.country)) + && (filters.city.is_empty() || (n.city == filters.city)) + && (filters.region.is_empty() || (n.region == filters.region)) + && (filters.ip.is_empty() || (n.ip == filters.ip)) }) .cloned() .collect() @@ -407,10 +407,10 @@ impl BrainData { && n.avail_vcpus >= filters.vcpus && n.avail_mem_mb >= filters.memory_mb && n.avail_storage_gbs >= filters.storage_gb - && (!filters.country.is_empty() && (n.country == filters.country)) - && (!filters.city.is_empty() && (n.city == filters.city)) - && (!filters.region.is_empty() && (n.region == filters.region)) - && (!filters.ip.is_empty() && (n.ip == filters.ip)) + && (filters.country.is_empty() || (n.country == filters.country)) + && (filters.city.is_empty() || (n.city == filters.city)) + && (filters.region.is_empty() || (n.region == filters.region)) + && (filters.ip.is_empty() || (n.ip == filters.ip)) }) .cloned() } diff --git a/src/grpc.rs b/src/grpc.rs index 9e3985f..98f1963 100644 --- a/src/grpc.rs +++ b/src/grpc.rs @@ -99,7 +99,7 @@ impl BrainDaemonService for BrainDaemonMock { &self, req: Request>, ) -> Result, Status> { - debug!("Some node connected to stream NewVMResp"); + debug!("Some node connected to stream NodeResourceReq"); let mut resp_stream = req.into_inner(); // Don't do this in prod. let mut node_pubkey = String::new(); @@ -272,7 +272,7 @@ impl BrainDaemonService for BrainDaemonMock { &self, req: Request>, ) -> Result, Status> { - debug!("Some node connected to stream NewVMResp"); + debug!("Some node connected to stream UpdateVmResp"); let mut resp_stream = req.into_inner(); while let Some(update_vm_resp) = resp_stream.next().await { match update_vm_resp { diff --git a/src/main.rs b/src/main.rs index bf0e8a0..5f3f08c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,7 +15,7 @@ async fn main() { .filter_level(log::LevelFilter::Debug) .init(); let data = Arc::new(BrainData::new()); - let addr = "[::1]:31337".parse().unwrap(); + let addr = "0.0.0.0:31337".parse().unwrap(); let daemon_server = BrainDaemonServiceServer::new(BrainDaemonMock::new(data.clone())); let cli_server = BrainCliServiceServer::new(BrainCliMock::new(data.clone()));