mirror of
https://gitlab.steamos.cloud/holo/steamos-manager.git
synced 2025-07-16 03:06:47 -04:00
daemon/user: Fix ObjectManager location and initialization
This commit is contained in:
parent
748fdc43cf
commit
88c2a0af96
2 changed files with 4 additions and 5 deletions
|
@ -17,6 +17,7 @@ use tracing_subscriber::{fmt, Registry};
|
||||||
#[cfg(not(test))]
|
#[cfg(not(test))]
|
||||||
use xdg::BaseDirectories;
|
use xdg::BaseDirectories;
|
||||||
use zbus::connection::{Builder, Connection};
|
use zbus::connection::{Builder, Connection};
|
||||||
|
use zbus::fdo::ObjectManager;
|
||||||
|
|
||||||
use crate::daemon::{channel, Daemon, DaemonCommand, DaemonContext};
|
use crate::daemon::{channel, Daemon, DaemonCommand, DaemonContext};
|
||||||
use crate::job::{JobManager, JobManagerService};
|
use crate::job::{JobManager, JobManagerService};
|
||||||
|
@ -144,11 +145,13 @@ pub async fn daemon() -> Result<()> {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
let context = UserContext { session };
|
let context = UserContext { session: session.clone() };
|
||||||
let mut daemon = Daemon::new(subscriber, system, rx).await?;
|
let mut daemon = Daemon::new(subscriber, system, rx).await?;
|
||||||
|
|
||||||
daemon.add_service(mirror_service);
|
daemon.add_service(mirror_service);
|
||||||
daemon.add_service(tdp_service);
|
daemon.add_service(tdp_service);
|
||||||
|
|
||||||
|
session.object_server().at("/", ObjectManager {}).await?;
|
||||||
|
|
||||||
daemon.run(context).await
|
daemon.run(context).await
|
||||||
}
|
}
|
||||||
|
|
|
@ -981,10 +981,6 @@ pub(crate) async fn create_interfaces(
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
object_server
|
|
||||||
.at(MANAGER_PATH, fdo::ObjectManager {})
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue