Skip to content

feat: use new cfg_select for cleaner code #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reneca merged 1 commit into from
Jul 16, 2026
Merged

feat: use new cfg_select for cleaner code #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 42 additions & 30 deletions cargo-prosa/src/package/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,27 @@ impl InstanceInstall {
// Get all path for system or home installation
let (install_bin_dir, install_config_dir, install_service_dir) = if args.get_flag("system")
{
#[cfg(target_os = "linux")]
{
(
"/usr/local/bin".to_string(),
"/etc/prosa".to_string(),
"/etc/systemd/system".to_string(),
)
}
#[cfg(target_os = "macos")]
{
(
"/usr/local/bin".to_string(),
"/etc/prosa".to_string(),
"/Library/LaunchDaemons".to_string(),
)
cfg_select! {
target_os = "linux" => {
(
"/usr/local/bin".to_string(),
"/etc/prosa".to_string(),
"/etc/systemd/system".to_string(),
)
}
target_os = "macos" => {
(
"/usr/local/bin".to_string(),
"/etc/prosa".to_string(),
"/Library/LaunchDaemons".to_string(),
)
}
_ => {
return Err(io::Error::new(
io::ErrorKind::Unsupported,
"Install is only supported on Linux and macOS",
));
}
}
} else {
let install_dir = env::var("HOME").map_err(|ve| {
Expand All @@ -75,21 +81,27 @@ impl InstanceInstall {
));
}

#[cfg(target_os = "linux")]
{
(
format!("{install_dir}/.local/bin"),
format!("{install_dir}/.config/prosa"),
format!("{install_dir}/.config/systemd/user"),
)
}
#[cfg(target_os = "macos")]
{
(
format!("{install_dir}/.local/bin"),
format!("{install_dir}/.config/prosa"),
format!("{install_dir}/Library/LaunchAgents"),
)
cfg_select! {
target_os = "linux" => {
(
format!("{install_dir}/.local/bin"),
format!("{install_dir}/.config/prosa"),
format!("{install_dir}/.config/systemd/user"),
)
}
target_os = "macos" => {
(
format!("{install_dir}/.local/bin"),
format!("{install_dir}/.config/prosa"),
format!("{install_dir}/Library/LaunchAgents"),
)
}
_ => {
return Err(io::Error::new(
io::ErrorKind::Unsupported,
"Install is only supported on Linux and macOS",
));
}
}
};

Expand Down
29 changes: 14 additions & 15 deletions prosa/src/io/listener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,22 +383,21 @@ pub struct ListenerSetting {
}

impl ListenerSetting {
#[cfg(target_family = "unix")]
fn default_max_socket() -> u64 {
rlimit::Resource::NOFILE
.get_soft()
.unwrap_or(u32::MAX as u64)
- 1
}

#[cfg(target_family = "windows")]
fn default_max_socket() -> u64 {
(rlimit::getmaxstdio() as u64) - 1
}

#[cfg(all(not(target_family = "unix"), not(target_family = "windows")))]
fn default_max_socket() -> u64 {
(u32::MAX as u64) - 1
cfg_select! {
target_family = "unix" => {
rlimit::Resource::NOFILE
.get_soft()
.unwrap_or(u32::MAX as u64)
- 1
}
target_family = "windows" => {
(rlimit::getmaxstdio() as u64) - 1
}
_ => {
(u32::MAX as u64) - 1
}
}
}

/// Method to create manually a target
Expand Down
96 changes: 50 additions & 46 deletions prosa_utils/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,62 +71,66 @@ pub fn os_country() -> Option<String> {

/// Method to try get the hostname from the OS
pub fn hostname() -> Option<String> {
#[cfg(target_family = "unix")]
if let Ok(host) = std::env::var("HOSTNAME").map(|h| h.trim().to_string())
&& !host.is_empty()
&& !host.contains('\n')
{
return Some(host);
}
cfg_select! {
target_family = "unix" => {
if let Ok(host) = std::env::var("HOSTNAME").map(|h| h.trim().to_string())
&& !host.is_empty()
&& !host.contains('\n')
{
return Some(host);
}

#[cfg(target_family = "unix")]
return Command::new("hostname")
.arg("-s")
.output()
.ok()
.and_then(|h| {
str::from_utf8(h.stdout.trim_ascii())
Command::new("hostname")
.arg("-s")
.output()
.ok()
.filter(|h| !h.is_empty() && !h.contains('\n'))
.map(|h| h.to_string())
});

#[cfg(target_family = "windows")]
return Command::new("hostname").output().ok().and_then(|h| {
str::from_utf8(h.stdout.trim_ascii())
.ok()
.filter(|h| !h.is_empty() && !h.contains('\n'))
.map(|h| h.to_string())
});

#[cfg(all(not(target_family = "unix"), not(target_family = "windows")))]
return None;
.and_then(|h| {
str::from_utf8(h.stdout.trim_ascii())
.ok()
.filter(|h| !h.is_empty() && !h.contains('\n'))
.map(|h| h.to_string())
})
}
target_family = "windows" => {
Command::new("hostname").output().ok().and_then(|h| {
str::from_utf8(h.stdout.trim_ascii())
.ok()
.filter(|h| !h.is_empty() && !h.contains('\n'))
.map(|h| h.to_string())
})
}
_ => None
}
}

/// Method to get a consistant host ID (UUID v1 or UUID v4) useful for `service.instance.id`
pub fn hostid() -> String {
#[cfg(target_os = "linux")]
if let Ok(machine_id) = std::fs::read_to_string("/etc/machine-id")
&& let Ok(machine_uuid) = Uuid::parse_str(machine_id.trim())
{
return machine_uuid.to_string();
}

#[cfg(target_os = "macos")]
if let Ok(output) = Command::new("ioreg")
.args(["-rd1", "-c", "IOPlatformExpertDevice"])
.output()
&& output.status.success()
&& let Ok(output_str) = String::from_utf8(output.stdout)
{
for line in output_str.lines() {
if line.contains("IOPlatformUUID")
&& let Some(value) = line.split('"').nth(3)
&& let Ok(machine_uuid) = Uuid::parse_str(value.trim())
cfg_select! {
target_os = "linux" => {
if let Ok(machine_id) = std::fs::read_to_string("/etc/machine-id")
&& let Ok(machine_uuid) = Uuid::parse_str(machine_id.trim())
{
return machine_uuid.to_string();
}
}
target_os = "macos" => {
if let Ok(output) = Command::new("ioreg")
.args(["-rd1", "-c", "IOPlatformExpertDevice"])
.output()
&& output.status.success()
&& let Ok(output_str) = String::from_utf8(output.stdout)
{
for line in output_str.lines() {
if line.contains("IOPlatformUUID")
&& let Some(value) = line.split('"').nth(3)
&& let Ok(machine_uuid) = Uuid::parse_str(value.trim())
{
return machine_uuid.to_string();
}
}
}
}
_ => {}
}

if let Some(hostname) = hostname() {
Expand Down
Loading