oreganoli/zhur - Change DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC

moved Hyper server code out to lib.rs

Created by oreganoli on January 11, 2021

DIIDKMIXQENUQIOIFHT62KAX4WL5MJWEB5BXHGUYCDSKIPRQVPOAC

Dependencies

In channels

main

Change contents

Replacement in zhur_gate/src/main.rs at line 1 [2.30]

B:BD[2.30] → [2.31:402]

use std::convert::Infallible;
use std::net::SocketAddr;
use hyper::{
    Body,
    Request,
    Response,
    Server,
    service::{
        service_fn,
        make_service_fn
    }
};
use zhur_common::{
    log::*,
    pretty_env_logger
};
async fn handle_reqs(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
    Ok(Response::new("Hi there!".into()))
}

[2.30]

[2.402]

use zhur_common::init_logger;
use zhur_gate::start_server;

Replacement in zhur_gate/src/main.rs at line 5 [2.30]

B:BD[2.435] → [2.435:1170]

    pretty_env_logger::init();
    let port = match std::env::var("ZHUR_GATE_PORT") {
        Ok(v) => match v.parse::<u16>() {
            Ok(n) => n,
            _ => {
                error!("ZHUR_GATE_PORT set to invalid value \"{}\", exiting.", &v);
                return;
            }
        },
        _ => {
            warn!("ZHUR_GATE_PORT env var not set. Assuming port 8080.");
            8080
        }
    };
    let addr = SocketAddr::from(([127, 0, 0, 1], port));
    let make_svc = make_service_fn(|_conn| async {
        Ok::<_, Infallible>(service_fn(handle_reqs))
    });
    let server = Server::bind(&addr).serve(make_svc);
    if let Err(e) = server.await {
        error!("HTTP server error: {}", e);
    }

[2.435]

[2.1170]

    init_logger();
    start_server().await;

File addition: lib.rs (-rw-r--r--)

[2.19]

use std::convert::Infallible;
use std::net::SocketAddr;
use hyper::{
    Body,
    Request,
    Response,
    Server,
    service::{
        service_fn,
        make_service_fn
    }
};
use zhur_common::log::*;
async fn handle_reqs(_req: Request<Body>) -> Result<Response<Body>, Infallible> {
    Ok(Response::new("Hi there!".into()))
}
/// Runs a Hyper HTTP server.
pub async fn start_server() {
    let port = match std::env::var("ZHUR_GATE_PORT") {
        Ok(v) => match v.parse::<u16>() {
            Ok(n) => n,
            _ => {
                error!("ZHUR_GATE_PORT set to invalid value \"{}\", exiting.", &v);
                return;
            }
        },
        _ => {
            warn!("ZHUR_GATE_PORT env var not set. Assuming port 8080.");
            8080
        }
    };
    let addr = SocketAddr::from(([127, 0, 0, 1], port));
    let make_svc = make_service_fn(|_conn| async {
        Ok::<_, Infallible>(service_fn(handle_reqs))
    });
    let server = Server::bind(&addr).serve(make_svc);
    if let Err(e) = server.await {
        error!("HTTP server error: {}", e);
    }
}

Replacement in zhur_common/src/lib.rs at line 4 [3.31]

B:BD[3.77] → [3.77:104]

pub use pretty_env_logger;

[3.77]

[3.104]

/// Initialize env logger, currently `pretty_env_logger`.
pub use pretty_env_logger::init as init_logger;