Compare commits

..

No commits in common. "28d4cf4ad5e28aad2500954abadf8ea3f81a7f8b" and "bddbdc06f3f087837b26dc5508d170dc035b5e3f" have entirely different histories.

3 changed files with 7 additions and 10 deletions

View File

@ -17,7 +17,7 @@ WORKDIR /magnetar
COPY ./ . COPY ./ .
RUN cargo build --release --frozen RUN cargo build --release
FROM docker.io/debian:bullseye-slim FROM docker.io/debian:bullseye-slim

View File

@ -125,7 +125,7 @@ pub struct MagnetarData {
fn env_database_url() -> String { fn env_database_url() -> String {
std::env::var("MAG_C_DATABASE_URL") std::env::var("MAG_C_DATABASE_URL")
.or_else(|_| std::env::var("DATABASE_URL")) .or_else(|_| std::env::var("DATABASE_URL"))
.expect("MAG_C_DATABASE_URL, DATABASE_URL or \"data.database_url\" in the default configuration must be set") .expect("MAG_C_HOST, DATABASE_URL or \"data.database_url\" in the default configuration must be set")
} }
impl Default for MagnetarData { impl Default for MagnetarData {

View File

@ -9,7 +9,6 @@ use magnetar_nodeinfo::version_1_0::{
use magnetar_nodeinfo::version_2_0::NodeInfo20; use magnetar_nodeinfo::version_2_0::NodeInfo20;
use magnetar_nodeinfo::version_2_1::{NodeInfo21, NodeInfo21Software}; use magnetar_nodeinfo::version_2_1::{NodeInfo21, NodeInfo21Software};
use serde::Serialize; use serde::Serialize;
use serde_json::{json, Value};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
const NODEINFO_PATH: &str = "/nodeinfo"; const NODEINFO_PATH: &str = "/nodeinfo";
@ -20,8 +19,10 @@ pub struct NodeInfoLink {
href: String, href: String,
} }
pub async fn handle_nodeinfo(State(config): State<&'static MagnetarConfig>) -> Json<Value> { pub async fn handle_nodeinfo(
let links = vec![ State(config): State<&'static MagnetarConfig>,
) -> Json<Vec<NodeInfoLink>> {
Json(vec![
NodeInfoLink { NodeInfoLink {
href: format!( href: format!(
"{}://{}/nodeinfo/2.0", "{}://{}/nodeinfo/2.0",
@ -36,11 +37,7 @@ pub async fn handle_nodeinfo(State(config): State<&'static MagnetarConfig>) -> J
), ),
rel: RelNodeInfo21.rel(), rel: RelNodeInfo21.rel(),
}, },
]; ])
let links_serialized = serde_json::to_value(links).unwrap();
Json(json!({ "links": links_serialized }))
} }
pub async fn handle_nodeinfo_21(State(config): State<&'static MagnetarConfig>) -> Json<NodeInfo21> { pub async fn handle_nodeinfo_21(State(config): State<&'static MagnetarConfig>) -> Json<NodeInfo21> {