From d4e45858aa91ae506ab6880222191cee5fac84b8 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Mon, 12 Oct 2026 22:09:55 +0100 Subject: [PATCH] Fail gracefully if the database isn't ready --- src/.pgenv | 4 ++++ src/Makefile | 9 +++++++++ src/development.md | 15 +++++++++++++++ src/docker-compose.yaml | 10 ++++++++++ src/expenses/app.go | 10 ++++------ 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/.pgenv create mode 100644 src/development.md create mode 100644 src/docker-compose.yaml diff --git a/src/.pgenv b/src/.pgenv new file mode 100644 index 0000000..1c801b8 --- /dev/null +++ b/src/.pgenv @@ -0,0 +1,4 @@ +PGDATA=/var/lib/postgresql/data +POSTGRES_USER=expdbuser +POSTGRES_PASSWORD=expDBPass +POSTGRES_DB=expenses diff --git a/src/Makefile b/src/Makefile index 76f4d0d..cc24ddb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,6 +13,15 @@ build_release_alpine: mkdir -p $(build)/data/ find $(build) -name "*.ttf" ! -name DejaVuSansMono.ttf -delete +devdb_start: + podman compose start database + +devdb_status: + podman compose stats database + +devdb_stop: + podman compose stop database + build_image: build_release_alpine docker buildx build -t $(registry)/$(repo)/expensesweb:$(tag) . diff --git a/src/development.md b/src/development.md new file mode 100644 index 0000000..97a9574 --- /dev/null +++ b/src/development.md @@ -0,0 +1,15 @@ +# Download a production database's data +```bash +docker exec -i \ + pg_dump -U -a -d > outputfile.sql +``` + +# Start a local development database + + +# Upload a database +```bash +# delete the pgsql-data-dev directory contents +# restart the container +psql -h 127.0.0.1 -p 5431 -U expdbuser -d expenses -f ./data.sql +``` diff --git a/src/docker-compose.yaml b/src/docker-compose.yaml new file mode 100644 index 0000000..83f0704 --- /dev/null +++ b/src/docker-compose.yaml @@ -0,0 +1,10 @@ +services: + database: + image: docker.io/library/postgres:16 + container_name: expenses-dev-db + hostname: expenses-dev-db + env_file: + - .pgenv + ports: + - "5431:5432" + restart: unless-stopped diff --git a/src/expenses/app.go b/src/expenses/app.go index b36d217..f5b3eb3 100644 --- a/src/expenses/app.go +++ b/src/expenses/app.go @@ -23,10 +23,8 @@ type ExpApp struct { TypeRepo repo.TypeRepository } -var ( - // App provides access to the expenses main service. - App *ExpApp -) +// App provides access to the expenses main service. +var App *ExpApp // NewExpenseApp returns a new instance of our core App. func NewExpenseApp(dbPool *pgxpool.Pool, luaVM *lua.LState) *ExpApp { @@ -103,7 +101,7 @@ func createPGXPoolConn(ctx context.Context) (*pgxpool.Pool, error) { var result int err = conn.QueryRow(ctx, "SELECT 1").Scan(&result) if err != nil { - panic("connection test query failed: " + err.Error()) + return nil, err } return conn, nil @@ -123,7 +121,7 @@ func StartApp() error { // Run the migrations err = runMigrations(luaVM) if err != nil { - log.Printf("Unable to run migrations: %v", err) + log.Fatalf("Unable to run migrations: %v", err) } // Create our final app thing