Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions rust/agama-lib/src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@
mod base_http_client;
pub use base_http_client::{BaseHTTPClient, BaseHTTPClientError};

pub mod event;
pub use event::{EventPayload, OldEvent};

mod websocket;
pub use websocket::{WebSocketClient, WebSocketError};
239 changes: 0 additions & 239 deletions rust/agama-lib/src/http/event.rs

This file was deleted.

7 changes: 2 additions & 5 deletions rust/agama-server/src/agama-web-server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use agama_lib::{auth::AuthToken, connection_to};
use agama_server::{
cert::Certificate,
logs::init_logging,
web::{self, run_monitor},
web::{self},
};
use agama_utils::api::event::Receiver;
use anyhow::Context;
Expand Down Expand Up @@ -320,9 +320,6 @@ async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
_ = l10n_helpers::init_locale();
init_logging().context("Could not initialize the logger")?;

let (tx, _) = channel(16);
run_monitor(tx.clone()).await?;

let (events_tx, events_rx) = channel(16);
monitor_events_channel(events_rx);

Expand All @@ -335,7 +332,7 @@ async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
.web_ui_dir
.clone()
.unwrap_or_else(|| PathBuf::from(DEFAULT_WEB_UI_DIR));
let service = web::service(config, events_tx, tx, dbus, web_ui_dir).await?;
let service = web::service(config, events_tx, dbus, web_ui_dir).await?;
// TODO: Move elsewhere? Use a singleton? (It would be nice to use the same
// generated self-signed certificate on both ports.)
let ssl_acceptor = if let Ok(ssl_acceptor) = ssl_acceptor(&args.to_certificate()?) {
Expand Down
4 changes: 1 addition & 3 deletions rust/agama-server/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use axum::{
};
use serde_json::json;

use crate::{users::password::PasswordCheckerError, web::common::ProgressServiceError};
use crate::users::password::PasswordCheckerError;

#[derive(thiserror::Error, Debug)]
pub enum Error {
Expand All @@ -36,8 +36,6 @@ pub enum Error {
Anyhow(String),
#[error("Agama service error: {0}")]
Service(#[from] ServiceError),
#[error("Progress service error: {0}")]
Progress(#[from] ProgressServiceError),
#[error("Could not check the password")]
PasswordCheck(#[from] PasswordCheckerError),
}
Expand Down
2 changes: 0 additions & 2 deletions rust/agama-server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ pub mod dbus;
pub mod error;
pub mod hostname;
pub mod logs;
pub mod manager;
pub mod profile;
pub mod security;
pub mod storage;
pub mod users;
pub mod web;
pub use web::service;
Expand Down
22 changes: 0 additions & 22 deletions rust/agama-server/src/manager.rs

This file was deleted.

Loading
Loading