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

overhaul context

Browse Source
This commit is contained in:
Aiden McClelland
2021-08-31 19:16:29 -06:00
parent 118f26af89
commit 34e599f826
16 changed files with 126 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
appmgr/src/bin/embassy-cli.rs
View File

@@ -1,5 +1,5 @@
use clap::Arg;
use embassy::context::{CliContext, EitherContext};
use embassy::context::CliContext;
use embassy::Error;
use rpc_toolkit::run_cli;
use rpc_toolkit::yajrc::RpcError;
@@ -35,6 +35,7 @@ fn inner_main() -> Result<(), Error> {
});
EitherContext::Cli(CliContext::init(matches)?)
},
(),
|e: RpcError| {
match e.data {
Some(Value::String(s)) => eprintln!("{}: {}", e.message, s),

4
appmgr/src/bin/embassyd.rs
View File

@@ -2,7 +2,7 @@ use std::path::Path;
use std::time::Duration;
use anyhow::anyhow;
use embassy::context::{EitherContext, RpcContext};
use embassy::context::RpcContext;
use embassy::db::model::Database;
use embassy::db::subscribe;
use embassy::hostname::{get_hostname, get_id};
@@ -46,7 +46,7 @@ async fn inner_main(cfg_path: Option<&str>) -> Result<(), Error> {
.await?;
}
let auth = auth(rpc_ctx.clone());
let ctx = EitherContext::Rpc(rpc_ctx.clone());
let ctx = rpc_ctx.clone();
let server = rpc_server!({
command: embassy::main_api,
context: ctx,