Added rust-toolchain.toml file; removed nightly-only rustfmt.toml
All checks were successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/deploy Pipeline was successful

This commit is contained in:
Jef Roosens 2022-04-28 10:56:30 +02:00
parent 0b9b5bb8e7
commit aa3051a6ef
Signed by: Jef Roosens
GPG key ID: B580B976584B5F30
7 changed files with 12 additions and 88 deletions

View file

@ -14,8 +14,7 @@ use tokio_util::io::StreamReader;
use crate::{DEFAULT_STATIC_SITE, STATIC_DIR_NAME};
#[derive(Deserialize)]
pub struct StaticDirParams
{
pub struct StaticDirParams {
dir: Option<String>,
}
@ -23,8 +22,7 @@ pub async fn post_deploy(
Extension(data_dir): Extension<String>,
Query(params): Query<StaticDirParams>,
res: BodyStream,
) -> impl IntoResponse
{
) -> impl IntoResponse {
// This converts a stream into something that implements AsyncRead, which we can then use to
// asynchronously write the file to disk
let mut read =
@ -56,8 +54,7 @@ pub async fn post_deploy(
res
}
fn process_archive(archive_path: &Path, static_dir: &Path) -> Result<(), ()>
{
fn process_archive(archive_path: &Path, static_dir: &Path) -> Result<(), ()> {
let file = std::fs::File::open(archive_path).map_err(|_| ())?;
let tar = GzDecoder::new(file);
let mut archive = Archive::new(tar);

View file

@ -2,7 +2,6 @@ use axum::{routing::post, Router};
mod deploy;
pub fn router() -> Router
{
pub fn router() -> Router {
Router::new().route("/deploy", post(deploy::post_deploy))
}

View file

@ -20,8 +20,7 @@ const STATIC_DIR_NAME: &str = "static";
const DEFAULT_STATIC_SITE: &str = "default";
#[tokio::main]
async fn main()
{
async fn main() {
// Enable tracing
tracing_subscriber::registry()
.with(tracing_subscriber::EnvFilter::new(

View file

@ -1,19 +1,16 @@
use axum::{response::IntoResponse, routing::get, Json, Router};
use serde_json::json;
pub fn router() -> Router
{
pub fn router() -> Router {
Router::new()
.route("/.well-known/matrix/server", get(get_matrix_server))
.route("/.well-known/matrix/client", get(get_matrix_client))
}
async fn get_matrix_server() -> impl IntoResponse
{
async fn get_matrix_server() -> impl IntoResponse {
Json(json!({"m.server": "matrix.rustybever.be:443"}))
}
async fn get_matrix_client() -> impl IntoResponse
{
async fn get_matrix_client() -> impl IntoResponse {
Json(json!({"m.homeserver": {"base_url": "https://matrix.rustybever.be"}}))
}

View file

@ -3,8 +3,7 @@ use std::time::Instant;
use axum::{extract::MatchedPath, http::Request, middleware::Next, response::IntoResponse};
use metrics_exporter_prometheus::{Matcher, PrometheusBuilder, PrometheusHandle};
pub fn setup_metrics_recorder() -> PrometheusHandle
{
pub fn setup_metrics_recorder() -> PrometheusHandle {
const EXPONENTIAL_SECONDS: &[f64] = &[
0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1.0, 2.5, 5.0, 10.0,
];
@ -20,8 +19,7 @@ pub fn setup_metrics_recorder() -> PrometheusHandle
}
// Taken from the examples section
pub async fn track_metrics<B>(req: Request<B>, next: Next<B>) -> impl IntoResponse
{
pub async fn track_metrics<B>(req: Request<B>, next: Next<B>) -> impl IntoResponse {
let start = Instant::now();
let path = if let Some(matched_path) = req.extensions().get::<MatchedPath>() {
matched_path.as_str().to_owned()