This commit is contained in:
Eugene Pankov 2022-06-27 10:15:00 +02:00
parent 417df0647e
commit 488bd7f62b
No known key found for this signature in database
GPG key ID: 5896FCBBDD1CF4F4
13 changed files with 16 additions and 16 deletions

View file

@ -3,7 +3,7 @@ use sea_orm::entity::prelude::*;
use serde::Serialize; use serde::Serialize;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Object, Serialize)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Object, Serialize)]
#[sea_orm(table_name = "known_hosts")] #[sea_orm(table_name = "known_hosts")]
#[oai(rename = "SSHKnownHost")] #[oai(rename = "SSHKnownHost")]
pub struct Model { pub struct Model {

View file

@ -5,7 +5,7 @@ use sea_orm::query::JsonValue;
use serde::Serialize; use serde::Serialize;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)]
#[sea_orm(table_name = "log")] #[sea_orm(table_name = "log")]
#[oai(rename = "LogEntry")] #[oai(rename = "LogEntry")]
pub struct Model { pub struct Model {

View file

@ -5,7 +5,7 @@ use sea_orm::sea_query::ForeignKeyAction;
use serde::Serialize; use serde::Serialize;
use uuid::Uuid; use uuid::Uuid;
#[derive(Debug, Clone, PartialEq, EnumIter, Enum, DeriveActiveEnum, Serialize)] #[derive(Debug, Clone, PartialEq, Eq, EnumIter, Enum, DeriveActiveEnum, Serialize)]
#[sea_orm(rs_type = "String", db_type = "String(Some(16))")] #[sea_orm(rs_type = "String", db_type = "String(Some(16))")]
pub enum RecordingKind { pub enum RecordingKind {
#[sea_orm(string_value = "terminal")] #[sea_orm(string_value = "terminal")]
@ -14,7 +14,7 @@ pub enum RecordingKind {
Traffic, Traffic,
} }
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)]
#[sea_orm(table_name = "recordings")] #[sea_orm(table_name = "recordings")]
#[oai(rename = "Recording")] #[oai(rename = "Recording")]
pub struct Model { pub struct Model {

View file

@ -2,7 +2,7 @@ use chrono::{DateTime, Utc};
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "sessions")] #[sea_orm(table_name = "sessions")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
use serde::Serialize; use serde::Serialize;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize, Object)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize, Object)]
#[sea_orm(table_name = "tickets")] #[sea_orm(table_name = "tickets")]
#[oai(rename = "Ticket")] #[oai(rename = "Ticket")]
pub struct Model { pub struct Model {

View file

@ -5,7 +5,7 @@ pub mod ticket {
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "tickets")] #[sea_orm(table_name = "tickets")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -6,7 +6,7 @@ pub mod session {
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "sessions")] #[sea_orm(table_name = "sessions")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -6,7 +6,7 @@ pub mod recording {
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use uuid::Uuid; use uuid::Uuid;
#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum)] #[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
#[sea_orm(rs_type = "String", db_type = "String(Some(16))")] #[sea_orm(rs_type = "String", db_type = "String(Some(16))")]
pub enum RecordingKind { pub enum RecordingKind {
#[sea_orm(string_value = "terminal")] #[sea_orm(string_value = "terminal")]
@ -15,7 +15,7 @@ pub mod recording {
Traffic, Traffic,
} }
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "recordings")] #[sea_orm(table_name = "recordings")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -5,7 +5,7 @@ pub mod known_host {
use sea_orm::entity::prelude::*; use sea_orm::entity::prelude::*;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "known_hosts")] #[sea_orm(table_name = "known_hosts")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -7,7 +7,7 @@ pub mod log_entry {
use sea_orm::query::JsonValue; use sea_orm::query::JsonValue;
use uuid::Uuid; use uuid::Uuid;
#[derive(Clone, Debug, PartialEq, DeriveEntityModel)] #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
#[sea_orm(table_name = "log")] #[sea_orm(table_name = "log")]
pub struct Model { pub struct Model {
#[sea_orm(primary_key, auto_increment = false)] #[sea_orm(primary_key, auto_increment = false)]

View file

@ -94,7 +94,7 @@ pub enum RCCommand {
Disconnect, Disconnect,
} }
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub enum RCState { pub enum RCState {
NotInitialized, NotInitialized,
Connecting, Connecting,
@ -506,7 +506,7 @@ impl RemoteClient {
impl Drop for RemoteClient { impl Drop for RemoteClient {
fn drop(&mut self) { fn drop(&mut self) {
for task in self.child_tasks.drain(..) { for task in self.child_tasks.drain(..) {
let _ = task.abort(); task.abort();
} }
info!("Closed connection"); info!("Closed connection");
debug!("Dropped"); debug!("Dropped");

View file

@ -294,7 +294,7 @@ impl ServerSession {
SessionHandleCommand::Close => { SessionHandleCommand::Close => {
let _ = self.emit_service_message("Session closed by admin").await; let _ = self.emit_service_message("Session closed by admin").await;
info!("Session closed by admin"); info!("Session closed by admin");
let _ = self.request_disconnect().await; self.request_disconnect().await;
self.disconnect_server().await; self.disconnect_server().await;
} }
} }

View file

@ -1,7 +1,7 @@
use tokio::sync::mpsc; use tokio::sync::mpsc;
use warpgate_common::SessionHandle; use warpgate_common::SessionHandle;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub enum SessionHandleCommand { pub enum SessionHandleCommand {
Close, Close,
} }