mirror of
https://github.com/pinnacle-comp/pinnacle.git
synced 2025-02-09 22:00:47 +01:00
Add logs in places
This commit is contained in:
parent
dc70a8a3e7
commit
b5707daa86
4 changed files with 10 additions and 6 deletions
2
TODO.md
Normal file
2
TODO.md
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
- Use compositor PID to uniquely ID gRPC socket
|
||||||
|
- Log git commit on startup and add to --help/-V
|
|
@ -419,7 +419,7 @@ impl Pinnacle {
|
||||||
self.input_state.kill_keybind = Some(kill_keybind);
|
self.input_state.kill_keybind = Some(kill_keybind);
|
||||||
|
|
||||||
if metaconfig.no_config {
|
if metaconfig.no_config {
|
||||||
info!("`--no-config` was set, not spawning config");
|
info!("`no-config` option was set, not spawning config");
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -626,7 +626,7 @@ impl Pinnacle {
|
||||||
let uds = tokio::net::UnixListener::bind(&socket_path)?;
|
let uds = tokio::net::UnixListener::bind(&socket_path)?;
|
||||||
let uds_stream = tokio_stream::wrappers::UnixListenerStream::new(uds);
|
let uds_stream = tokio_stream::wrappers::UnixListenerStream::new(uds);
|
||||||
|
|
||||||
std::env::set_var("PINNACLE_GRPC_SOCKET", socket_path);
|
std::env::set_var("PINNACLE_GRPC_SOCKET", &socket_path);
|
||||||
|
|
||||||
let grpc_server = tonic::transport::Server::builder()
|
let grpc_server = tonic::transport::Server::builder()
|
||||||
.add_service(refl_service)
|
.add_service(refl_service)
|
||||||
|
@ -646,6 +646,8 @@ impl Pinnacle {
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
info!("gRPC server started at {}", socket_path.display());
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,10 +91,8 @@ async fn main() -> anyhow::Result<()> {
|
||||||
let backend: cli::Backend = match (cli.backend, cli.force) {
|
let backend: cli::Backend = match (cli.backend, cli.force) {
|
||||||
(None, _) => {
|
(None, _) => {
|
||||||
if in_graphical_env {
|
if in_graphical_env {
|
||||||
info!("Starting winit backend");
|
|
||||||
cli::Backend::Winit
|
cli::Backend::Winit
|
||||||
} else {
|
} else {
|
||||||
info!("Starting udev backend");
|
|
||||||
cli::Backend::Udev
|
cli::Backend::Udev
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -110,7 +108,6 @@ async fn main() -> anyhow::Result<()> {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
info!("Starting winit backend");
|
|
||||||
cli::Backend::Winit
|
cli::Backend::Winit
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -127,7 +124,6 @@ async fn main() -> anyhow::Result<()> {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
info!("Starting udev backend");
|
|
||||||
cli::Backend::Udev
|
cli::Backend::Udev
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -182,6 +178,8 @@ async fn main() -> anyhow::Result<()> {
|
||||||
|
|
||||||
if !metaconfig.no_config {
|
if !metaconfig.no_config {
|
||||||
state.pinnacle.start_config(false)?;
|
state.pinnacle.start_config(false)?;
|
||||||
|
} else {
|
||||||
|
info!("`no-config` option was set, not spawning config");
|
||||||
}
|
}
|
||||||
|
|
||||||
event_loop.run(None, &mut state, |state| {
|
event_loop.run(None, &mut state, |state| {
|
||||||
|
|
|
@ -332,6 +332,7 @@ impl State {
|
||||||
|
|
||||||
let (backend, pinnacle) = match backend {
|
let (backend, pinnacle) = match backend {
|
||||||
cli::Backend::Winit => {
|
cli::Backend::Winit => {
|
||||||
|
info!("Starting winit backend");
|
||||||
let uninit_winit = Winit::try_new(display.handle())?;
|
let uninit_winit = Winit::try_new(display.handle())?;
|
||||||
let mut pinnacle = Pinnacle::new(
|
let mut pinnacle = Pinnacle::new(
|
||||||
display,
|
display,
|
||||||
|
@ -345,6 +346,7 @@ impl State {
|
||||||
(backend::Backend::Winit(winit), pinnacle)
|
(backend::Backend::Winit(winit), pinnacle)
|
||||||
}
|
}
|
||||||
cli::Backend::Udev => {
|
cli::Backend::Udev => {
|
||||||
|
info!("Starting udev backend");
|
||||||
let uninit_udev = Udev::try_new(display.handle())?;
|
let uninit_udev = Udev::try_new(display.handle())?;
|
||||||
let mut pinnacle = Pinnacle::new(
|
let mut pinnacle = Pinnacle::new(
|
||||||
display,
|
display,
|
||||||
|
|
Loading…
Add table
Reference in a new issue