Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Publish collab docker images on CI, deploy pre-built images

Browse source
This commit is contained in:
Max Brunsfeld 2022-10-19 15:31:47 -07:00
parent efa6745035
commit 9952f08cce
3 changed files with 79 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/collab/src/main.rs
View file

@ -9,7 +9,7 @@ mod db_tests;
#[cfg(test)]
mod integration_tests;
use axum::{body::Body, Router};
use axum::{routing::get, Router};
use collab::{Error, Result};
use db::{Db, PostgresDb};
use serde::Deserialize;
@ -22,6 +22,8 @@ use tracing_log::LogTracer;
use tracing_subscriber::{filter::EnvFilter, fmt::format::JsonFields, Layer};
use util::ResultExt;
const VERSION: &'static str = env!("CARGO_PKG_VERSION");
#[derive(Default, Deserialize)]
pub struct Config {
pub http_port: u16,
@ -67,9 +69,9 @@ async fn main() -> Result<()> {
rpc_server.start_recording_project_activity(Duration::from_secs(5 * 60), rpc::RealExecutor);
let app = Router::<Body>::new()
.merge(api::routes(&rpc_server, state.clone()))
.merge(rpc::routes(rpc_server));
let app = api::routes(&rpc_server, state.clone())
.merge(rpc::routes(rpc_server))
.merge(Router::new().route("/", get(handle_root)));
axum::Server::from_tcp(listener)?
.serve(app.into_make_service_with_connect_info::<SocketAddr>())
@ -78,6 +80,10 @@ async fn main() -> Result<()> {
Ok(())
}
async fn handle_root() -> String {
format!("collab v{VERSION}")
}
pub fn init_tracing(config: &Config) -> Option<()> {
use std::str::FromStr;
use tracing_subscriber::layer::SubscriberExt;