Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-02 05:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Get the tracing in

Browse Source
This commit is contained in:
Justin Miller
2021-10-10 20:41:09 -06:00
committed by Aiden McClelland
parent 81164f974f
commit c3ac27865d
27 changed files with 226 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
appmgr/src/net/mdns.rs
View File

@@ -46,7 +46,7 @@ unsafe impl Sync for MdnsControllerInner {}
impl MdnsControllerInner {
fn load_services(&mut self) {
unsafe {
log::debug!("Loading services for mDNS");
tracing::debug!("Loading services for mDNS");
let mut res;
let http_tcp_cstr = std::ffi::CString::new("_http._tcp")
.expect("Could not cast _http._tcp to c string");
@@ -70,14 +70,14 @@ impl MdnsControllerInner {
);
if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res);
log::error!(
tracing::error!(
"Could not add service to Avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services");
}
log::info!(
tracing::info!(
"Published {:?}",
std::ffi::CStr::from_ptr(self.hostname_raw)
);
@@ -87,7 +87,7 @@ impl MdnsControllerInner {
.get_onion_address()
.get_address_without_dot_onion()
+ ".local";
log::debug!("Adding mdns CNAME entry for {}", &lan_address);
tracing::debug!("Adding mdns CNAME entry for {}", &lan_address);
let lan_address_ptr = std::ffi::CString::new(lan_address)
.expect("Could not cast lan address to c string");
res = avahi_sys::avahi_entry_group_add_record(
@@ -105,7 +105,7 @@ impl MdnsControllerInner {
);
if res < avahi_sys::AVAHI_OK {
let e_str = avahi_strerror(res);
log::error!(
tracing::error!(
"Could not add record for {:?} to Avahi entry group: {:?}",
lan_address_ptr,
std::ffi::CStr::from_ptr(e_str)
@@ -113,13 +113,13 @@ impl MdnsControllerInner {
avahi_free(e_str as *mut c_void);
panic!("Failed to load Avahi services");
}
log::info!("Published {:?}", lan_address_ptr);
tracing::info!("Published {:?}", lan_address_ptr);
}
}
}
fn init() -> Self {
unsafe {
log::debug!("Initializing mDNS controller");
tracing::debug!("Initializing mDNS controller");
let simple_poll = avahi_sys::avahi_simple_poll_new();
let poll = avahi_sys::avahi_simple_poll_get(simple_poll);
let mut box_err = Box::pin(0 as i32);
@@ -133,7 +133,7 @@ impl MdnsControllerInner {
);
if avahi_client == std::ptr::null_mut::<AvahiClient>() {
let e_str = avahi_strerror(*box_err);
log::error!(
tracing::error!(
"Could not create avahi client: {:?}",
std::ffi::CStr::from_ptr(e_str)
);
@@ -144,7 +144,7 @@ impl MdnsControllerInner {
avahi_sys::avahi_entry_group_new(avahi_client, Some(noop), std::ptr::null_mut());
if group == std::ptr::null_mut() {
let e_str = avahi_strerror(avahi_client_errno(avahi_client));
log::error!(
tracing::error!(
"Could not create avahi entry group: {:?}",
std::ffi::CStr::from_ptr(e_str)
);

16
appmgr/src/net/tor.rs
View File

@@ -233,7 +233,7 @@ impl TorControllerInner {
}
async fn add_embassyd_onion(&mut self) -> Result<(), Error> {
log::info!(
tracing::info!(
"Registering Main Tor Service: {}",
self.embassyd_tor_key.public().get_onion_address()
);
@@ -249,7 +249,7 @@ impl TorControllerInner {
&mut std::iter::once(&(self.embassyd_addr.port(), self.embassyd_addr)),
)
.await?;
log::info!(
tracing::info!(
"Registered Main Tor Service: {}",
self.embassyd_tor_key.public().get_onion_address()
);
@@ -301,7 +301,7 @@ impl TorControllerInner {
}
}
Err(e) => {
log::info!("Failed to reconnect to tor control socket: {}", e);
tracing::info!("Failed to reconnect to tor control socket: {}", e);
}
}
tokio::time::sleep(Duration::from_secs(1)).await;
@@ -345,7 +345,7 @@ impl TorControllerInner {
}
pub async fn tor_health_check(client: &Client, tor_controller: &TorController) {
log::debug!("Attempting to self-check tor address");
tracing::debug!("Attempting to self-check tor address");
let onion = tor_controller.embassyd_onion().await;
let result = client
.post(format!("http://{}/rpc/v1", onion))
@@ -363,24 +363,24 @@ pub async fn tor_health_check(client: &Client, tor_controller: &TorController) {
match result {
// if success, do nothing
Ok(_) => {
log::debug!(
tracing::debug!(
"Successfully verified main tor address liveness at {}",
onion
)
}
// if failure, disconnect tor control port, and restart tor controller
Err(e) => {
log::error!("Unable to reach self over tor: {}", e);
tracing::error!("Unable to reach self over tor: {}", e);
loop {
match tor_controller.replace().await {
Ok(restarted) => {
if restarted {
log::error!("Tor has been recently restarted, refusing to restart");
tracing::error!("Tor has been recently restarted, refusing to restart");
}
break;
}
Err(e) => {
log::error!("Unable to restart tor: {}", e);
tracing::error!("Unable to restart tor: {}", e);
}
}
}

14
appmgr/src/net/wifi.rs
View File

@@ -42,13 +42,13 @@ pub async fn add(
priority: isize,
connect: bool,
) -> Result<(), Error> {
log::info!("Adding new WiFi network: '{}'", ssid);
tracing::info!("Adding new WiFi network: '{}'", ssid);
wpa_supplicant.add_network(ssid, password, priority).await?;
if connect {
let current = wpa_supplicant.get_current_network().await?;
let connected = wpa_supplicant.select_network(ssid).await?;
if !connected {
log::error!("Faild to add new WiFi network: '{}'", ssid);
tracing::error!("Faild to add new WiFi network: '{}'", ssid);
wpa_supplicant.remove_network(ssid).await?;
match current {
None => {}
@@ -63,7 +63,7 @@ pub async fn add(
tokio::spawn(async move {
match add_procedure(wpa_supplicant, &ssid, &password, priority, connect).await {
Err(e) => {
log::error!("Failed to add new WiFi network '{}': {}", ssid, e);
tracing::error!("Failed to add new WiFi network '{}': {}", ssid, e);
}
Ok(_) => {}
}
@@ -83,12 +83,12 @@ pub async fn connect(#[arg] ssid: String) -> Result<(), Error> {
let current = wpa_supplicant.get_current_network().await?;
let connected = wpa_supplicant.select_network(&ssid).await?;
if connected {
log::info!("Successfully connected to WiFi: '{}'", ssid);
tracing::info!("Successfully connected to WiFi: '{}'", ssid);
} else {
log::error!("Failed to connect to WiFi: '{}'", ssid);
tracing::error!("Failed to connect to WiFi: '{}'", ssid);
match current {
None => {
log::warn!("No WiFi to revert to!");
tracing::warn!("No WiFi to revert to!");
}
Some(current) => {
wpa_supplicant.select_network(&current).await?;
@@ -101,7 +101,7 @@ pub async fn connect(#[arg] ssid: String) -> Result<(), Error> {
tokio::spawn(async move {
match connect_procedure(wpa_supplicant, &ssid).await {
Err(e) => {
log::error!("Failed to connect to WiFi network '{}': {}", &ssid, e);
tracing::error!("Failed to connect to WiFi network '{}': {}", &ssid, e);
}
Ok(_) => {}
}