diff options
| author | Jesse Luehrs <doy@tozt.net> | 2019-11-21 15:11:36 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2019-11-21 15:11:36 -0500 |
| commit | d5e79e1194cb2c76da6b366167dbe258e229bdc6 (patch) | |
| tree | 55db4fcb8233823bb229bbb592a95ccd098da36e /teleterm | |
| parent | ea36c04d25636384f29f6b25bf9bf0b55bdd9c0e (diff) | |
| download | teleterm-d5e79e1194cb2c76da6b366167dbe258e229bdc6.tar.gz teleterm-d5e79e1194cb2c76da6b366167dbe258e229bdc6.zip | |
make it return json
Diffstat (limited to 'teleterm')
| -rw-r--r-- | teleterm/Cargo.toml | 1 | ||||
| -rw-r--r-- | teleterm/src/protocol.rs | 2 | ||||
| -rw-r--r-- | teleterm/src/term.rs | 2 | ||||
| -rw-r--r-- | teleterm/src/web.rs | 13 |
4 files changed, 4 insertions, 14 deletions
diff --git a/teleterm/Cargo.toml b/teleterm/Cargo.toml index caa4c35..d9be990 100644 --- a/teleterm/Cargo.toml +++ b/teleterm/Cargo.toml @@ -36,6 +36,7 @@ ratelimit_meter = "5" regex = "1" reqwest = "0.9.22" serde = "1" +serde_json = "1" sha1 = "0.6" snafu = { version = "0.5", features = ["futures-01"] } tokio = "0.1.22" diff --git a/teleterm/src/protocol.rs b/teleterm/src/protocol.rs index 20e987d..03ecd97 100644 --- a/teleterm/src/protocol.rs +++ b/teleterm/src/protocol.rs @@ -4,7 +4,7 @@ use std::convert::{TryFrom as _, TryInto as _}; pub type FramedReadHalf<S> = FramedReader<tokio::io::ReadHalf<S>>; pub type FramedWriteHalf<S> = FramedWriter<tokio::io::WriteHalf<S>>; -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize)] pub struct Session { pub id: String, pub username: String, diff --git a/teleterm/src/term.rs b/teleterm/src/term.rs index 02c21bb..41ba022 100644 --- a/teleterm/src/term.rs +++ b/teleterm/src/term.rs @@ -1,6 +1,6 @@ use crate::prelude::*; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)] pub struct Size { pub rows: u16, pub cols: u16, diff --git a/teleterm/src/web.rs b/teleterm/src/web.rs index 5754bcd..202bc7e 100644 --- a/teleterm/src/web.rs +++ b/teleterm/src/web.rs @@ -108,18 +108,7 @@ fn handle_list( tokio::spawn(lister.map_err(|e| log::warn!("error listing: {}", e))); match r_sessions.wait().unwrap() { Ok(sessions) => { - let mut body = String::new(); - for session in sessions { - log::debug!( - "found session with id {} and name {}", - session.id, - session.username - ); - body.push_str(&format!( - "{}: {}\n", - session.id, session.username - )); - } + let body = serde_json::to_string(&sessions).unwrap(); (state, hyper::Response::new(hyper::Body::from(body))) } Err(e) => { |