BioArchLinux/bioarchlinux-packages
2
0
Fork 0
mirror of https://github.com/BioArchLinux/bioarchlinux-packages.git synced 2025-03-10 06:24:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: make sure batch event is start

Browse source
This commit is contained in:
imlonghao 2022-01-23 18:57:15 +08:00
parent 21d46e2437
commit 3fa0610b51
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Changed
- Change SQL to make sure batch event is `start`
### Removed ### Removed
- Remove `Courier` from font-family - Remove `Courier` from font-family

8
src/main.rs
View file

@ -19,7 +19,7 @@ code {
} }
</style>"#; </style>"#;
#[derive(Debug, ToSql, FromSql, Display, PartialEq)] #[derive(Debug, ToSql, FromSql, Display)]
#[postgres(name = "batchevent")] #[postgres(name = "batchevent")]
enum BatchEvent { enum BatchEvent {
#[postgres(name = "start")] #[postgres(name = "start")]
@ -233,15 +233,11 @@ async fn get_pkg_log(
let conn = db.get().await.unwrap(); let conn = db.get().await.unwrap();
let rows = conn let rows = conn
.query( .query(
"select * from lilac.batch where ts < $1 order by id desc limit 1", "select logdir from lilac.batch where ts < $1 and event = 'start' order by id desc limit 1",
&[&dt], &[&dt],
) )
.await .await
.unwrap(); .unwrap();
let event: BatchEvent = rows[0].get("event");
if event != BatchEvent::Start {
return HttpResponse::BadRequest().body("wrong time");
}
let logdir: String = rows[0].get("logdir"); let logdir: String = rows[0].get("logdir");
let contents = let contents =
std::fs::read_to_string(format!("/home/lilydjwg/.lilac/log/{}/{}.log", logdir, name)) std::fs::read_to_string(format!("/home/lilydjwg/.lilac/log/{}/{}.log", logdir, name))