Merge remote-tracking branch 'origin/main' into snapshots

This commit is contained in:
Marin Postma 2021-04-01 15:10:33 +02:00
當前提交 248e9b3808
沒有發現已知的金鑰在資料庫的簽署中
GPG key ID: D5241F0C0C865F30
共有 3 個文件被更改,包括 36 次插入3 次删除

查看文件

@ -56,9 +56,18 @@ struct VersionResponse {
#[get("/version", wrap = "Authentication::Private")]
async fn get_version() -> HttpResponse {
let commit_sha = match option_env!("COMMIT_SHA") {
Some("") | None => env!("VERGEN_SHA"),
Some(commit_sha) => commit_sha
};
let commit_date = match option_env!("COMMIT_DATE") {
Some("") | None => env!("VERGEN_COMMIT_DATE"),
Some(commit_date) => commit_date
};
HttpResponse::Ok().json(VersionResponse {
commit_sha: env!("VERGEN_SHA").to_string(),
build_date: env!("VERGEN_BUILD_TIMESTAMP").to_string(),
commit_sha: commit_sha.to_string(),
build_date: commit_date.to_string(),
pkg_version: env!("CARGO_PKG_VERSION").to_string(),
})
}