mirrors/pict-rs
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs.git synced 2024-11-28 04:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into asonix/generic-pictrs-storage

Browse source
This commit is contained in:
Aode (lion) 2021-10-22 23:49:47 -05:00
commit 36b83f114a
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Cargo.lock generated
View file

@ -1949,7 +1949,8 @@ dependencies = [
[[package]]
name = "tracing-actix-web"
version = "0.4.0-beta.15"
source = "git+https://github.com/asonix/tracing-actix-web?branch=asonix/update-deps#1dbfa67f88e4f1fc8a1b800a8a47c606114b8334"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5d25e8e2381e03c36530607daea5663488a21a1b75db0431cf9b961e9ca8a02"
dependencies = [
"actix-web",
"opentelemetry",
@ -1974,7 +1975,8 @@ dependencies = [
[[package]]
name = "tracing-awc"
version = "0.1.0-beta.6"
source = "git+https://git.asonix.dog/asonix/tracing-awc?branch=main#282e715969b4d29b8490de1f2a6311a5e3764f7a"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf90c391b9e519449554c325aea5ebfce3d0b525f193428250b0cb5389d6e13"
dependencies = [
"actix-http",
"awc",

10
Cargo.toml
View file

@ -6,7 +6,7 @@ authors = ["asonix <asonix@asonix.dog>"]
license = "AGPL-3.0"
readme = "README.md"
repository = "https://git.asonix.dog/asonix/pict-rs"
edition = "2018"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[features]
@ -51,15 +51,11 @@ url = "2.2"
uuid = { version = "0.8.2", features = ["v4", "serde"]}
[dependencies.tracing-actix-web]
version = "0.4.0-beta.14"
version = "0.4.0-beta.15"
default-features = false
features = ["emit_event_on_error", "opentelemetry_0_16"]
git = "https://github.com/asonix/tracing-actix-web"
branch = "asonix/update-deps"
[dependencies.tracing-awc]
version = "0.1.0-beta.4"
version = "0.1.0-beta.5"
default-features = false
features = ["emit_event_on_error", "opentelemetry_0_16"]
git = "https://git.asonix.dog/asonix/tracing-awc"
branch = "main"

2
docker/prod/docker-compose.yml
View file

@ -2,7 +2,7 @@ version: '3.3'
services:
pictrs:
image: asonix/pictrs:v0.3.0-alpha.39
image: asonix/pictrs:v0.3.0-alpha.40
ports:
- "127.0.0.1:8080:8080"
restart: always

1
src/middleware.rs
View file

@ -113,7 +113,6 @@ where
.headers()
.get("X-Request-Deadline")
.and_then(|deadline| {
use std::convert::TryInto;
let deadline = time::OffsetDateTime::from_unix_timestamp_nanos(
deadline.to_str().ok()?.parse().ok()?,
)