Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion src/api.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::jobs::{Job, JobProgress, JobQueue, JobStatus, Quadrant, VideoQuadrantSelection, WebDavConfig};
use crate::jobs::{Job, JobProgress, JobQueue, JobStatus, LogEntry, Quadrant, VideoQuadrantSelection, WebDavConfig};
use crate::webdav::WebDavClient;
use anyhow::Result;
use axum::{
Expand Down Expand Up @@ -90,6 +90,7 @@ pub async fn run_server(port: u16, data_dir: &str) -> Result<()> {
.route("/api/jobs/pending", get(get_pending_job))
.route("/api/jobs/claim", post(claim_job))
.route("/api/jobs/{id}/progress", patch(update_job_progress))
.route("/api/jobs/{id}/logs", post(append_job_logs))
.route("/health", get(health_check))
// Static files for worker provisioning
.route("/assets/worker", get(serve_worker_binary))
Expand Down Expand Up @@ -456,6 +457,49 @@ async fn update_job_progress(
}
}

#[derive(Debug, Deserialize)]
struct AppendLogsRequest {
logs: Vec<LogEntryRequest>,
}

#[derive(Debug, Deserialize)]
struct LogEntryRequest {
timestamp: String,
level: String,
message: String,
}

/// Append log entries to a job
async fn append_job_logs(
State(state): State<AppState>,
Path(id): Path<String>,
Json(req): Json<AppendLogsRequest>,
) -> Response {
let logs: Vec<LogEntry> = req.logs.into_iter().map(|l| {
LogEntry {
timestamp: chrono::DateTime::parse_from_rfc3339(&l.timestamp)
.map(|dt| dt.with_timezone(&chrono::Utc))
.unwrap_or_else(|_| chrono::Utc::now()),
level: l.level,
message: l.message,
}
}).collect();

let queue = state.queue.lock().unwrap();
match queue.append_job_logs(&id, logs) {
Ok(_) => {
StatusCode::OK.into_response()
}
Err(e) => {
error!("Failed to append job logs: {}", e);
AppError {
status: StatusCode::NOT_FOUND,
message: format!("Job not found: {}", e),
}.into_response()
}
}
}

async fn serve_worker_binary() -> Response {
// Serve the Linux worker binary from ./assets/worker-linux
let path = "./assets/worker-linux";
Expand Down
Loading