This commit is contained in:
Robin Appelman 2020-04-02 14:18:43 +02:00
commit 280b8a496f
5 changed files with 104 additions and 11 deletions

3
.dockerignore Normal file
View file

@ -0,0 +1,3 @@
target
.git
.idea

32
Cargo.lock generated
View file

@ -114,6 +114,18 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]]
name = "chrono"
version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2"
dependencies = [
"num-integer",
"num-traits",
"serde",
"time",
]
[[package]]
name = "core-foundation"
version = "0.7.0"
@ -517,6 +529,7 @@ dependencies = [
name = "log-archiver"
version = "0.1.0"
dependencies = [
"chrono",
"dotenv",
"main_error",
"reqwest",
@ -631,6 +644,25 @@ dependencies = [
"winapi 0.3.8",
]
[[package]]
name = "num-integer"
version = "0.1.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
dependencies = [
"autocfg",
]
[[package]]
name = "num_cpus"
version = "1.12.0"

View file

@ -10,5 +10,6 @@ dotenv = "0.15.0"
main_error = "0.1.0"
tokio = { version = "0.2.13", features = ["macros", "time"] }
reqwest = { version = "0.10.4", features = [] }
serde = "1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
chrono = { version = "0.4", features = ["serde"] }

12
Dockerfile Normal file
View file

@ -0,0 +1,12 @@
FROM ekidd/rust-musl-builder AS build
ADD . ./
RUN sudo chown -R rust:rust .
RUN cargo build --release
FROM scratch
COPY --from=build /home/rust/src/target/x86_64-unknown-linux-musl/release/log-archiver /
CMD ["/log-archiver"]

View file

@ -1,5 +1,7 @@
use chrono::{DateTime, Utc};
use main_error::MainError;
use reqwest::Response;
use reqwest::{Client, Response};
use serde::Deserialize;
use serde_json::Value;
use sqlx::postgres::PgPool;
use std::time::Duration;
@ -7,10 +9,42 @@ use tokio::time::delay_for;
#[tokio::main]
async fn main() -> Result<(), MainError> {
let pool = PgPool::builder()
.max_size(2)
.build(&dotenv::var("DATABASE_URL")?)
let database_url = dotenv::var("DATABASE_URL")?;
let api_base =
dotenv::var("API_BASE").unwrap_or_else(|_| "http://logs.tf/api/v1/log".to_string());
loop {
if let Err(e) = archive(&database_url, &api_base).await {
eprintln!("{:?}", e);
}
delay_for(Duration::from_secs(60)).await;
}
}
async fn get_last_demo(client: &Client, api_base: &str) -> Result<i32, MainError> {
let response: Response = client
.get(&format!("{}?limit=100", api_base))
.send()
.await?;
let listing: LogListing = serde_json::from_str(&response.text().await?)?;
let logs = match listing.success {
true => listing.logs,
false => return Err("Failed to list logs")?,
};
let now = Utc::now();
// take a demo from at least 1h ago since ongoing games can update their demos
let last_log = logs
.into_iter()
.find(|log| now.signed_duration_since(log.date) > chrono::Duration::seconds(3600));
Ok(last_log.ok_or("Failed to find last log")?.id)
}
async fn archive(database_url: &str, api_base: &str) -> Result<(), MainError> {
let pool = PgPool::builder().max_size(2).build(database_url).await?;
let client = reqwest::Client::new();
@ -18,7 +52,8 @@ async fn main() -> Result<(), MainError> {
.fetch_one(&pool)
.await?;
let last_demo = 2510323; // TODO dynamically determine this
let last_demo = get_last_demo(&client, api_base).await?;
println!("Archiving up to log {}", last_demo);
let mut last_archived = row.last_archived.unwrap_or_default();
@ -30,10 +65,7 @@ async fn main() -> Result<(), MainError> {
delay_for(Duration::from_millis(200)).await;
let response: Response = client
.get(&format!(
"https://logstf.vrchat.network/api/v1/log/{}",
last_archived
))
.get(&format!("{}/{}", api_base, last_archived))
.send()
.await?;
let body: Value = serde_json::from_str(&response.text().await?)?;
@ -49,3 +81,16 @@ async fn main() -> Result<(), MainError> {
Ok(())
}
#[derive(Debug, Deserialize)]
struct LogListing {
success: bool,
logs: Vec<LogInfo>,
}
#[derive(Debug, Deserialize)]
struct LogInfo {
id: i32,
#[serde(with = "chrono::serde::ts_seconds")]
date: DateTime<Utc>,
}