Update dependencies

Author: max-lt

.vscode/settings.json

@@ -5,6 +5,7 @@
     "chrono",
     "codegen",
     "dotenv",
+    "dotenvy",
     "openworkers",
     "serde",
     "sqlx"

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "openworkers-logs"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2024"
 
 [dependencies]
@@ -14,11 +14,11 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.137"
 log = "0.4.21"
 env_logger = "0.11.6"
-dotenv = "0.15.0"
 base64 = "0.22.1"
 chrono = { version = "0.4", features = ["serde"] }
 uuid = { version = "1.0", features = ["serde", "v4"] }
 async-stream = "0.3"
+dotenvy = "0.15.7"
 
 [profile.release]
 strip = true

Cargo.toml

@@ -1,6 +1,6 @@
 use chrono::{DateTime, Utc};
 use serde::Serialize;
-use sqlx::{postgres::PgPoolOptions, PgPool};
+use sqlx::{PgPool, postgres::PgPoolOptions};
 use std::str::FromStr;
 use uuid::Uuid;
 
@@ -40,7 +40,21 @@ pub struct LogEntry {
 }
 
 pub async fn create_pool() -> Result<PgPool, sqlx::Error> {
-    let database_url = std::env::var("DATABASE_URL").expect("DATABASE_URL must be set");
+    let database_url = match std::env::var("DATABASE_URL") {
+        Ok(url) => url,
+        Err(_) => {
+            let host = std::env::var("POSTGRES_HOST").expect("POSTGRES_HOST must be set");
+            let port = std::env::var("POSTGRES_PORT").expect("POSTGRES_PORT must be set");
+            let user = std::env::var("POSTGRES_USER").expect("POSTGRES_USER must be set");
+            let password =
+                std::env::var("POSTGRES_PASSWORD").expect("POSTGRES_PASSWORD must be set");
+            let database = std::env::var("POSTGRES_DB").expect("POSTGRES_DB must be set");
+
+            log::debug!("DATABASE_URL not set, using POSTGRES_* env vars");
+
+            format!("postgres://{user}:{password}@{host}:{port}/{database}")
+        }
+    };
 
     log::info!("Connecting to database...");
 

src/db.rs

@@ -2,17 +2,17 @@ mod db;
 mod nats;
 mod routes;
 
-use actix_web::{middleware, web, App, HttpServer};
+use actix_web::{App, HttpServer, middleware, web};
 use chrono::Utc;
 use futures::StreamExt;
 use uuid::Uuid;
 
-use db::{create_pool, insert_log, LogEntry, LogLevel};
-use routes::{health, stream_worker_logs, AppState};
+use db::{LogEntry, LogLevel, create_pool, insert_log};
+use routes::{AppState, health, stream_worker_logs};
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
     env_logger::init();
 
     log::info!("Starting OpenWorkers Logs Service...");