.gitignore

@@ -1,4 +1,3 @@
 /config.toml
-/compose.yml
 /highscore-server
 /db

Dockerfile

@@ -2,12 +2,10 @@ FROM thevlang/vlang:alpine AS build
 
 WORKDIR /tmp/app
 COPY . .
-RUN v -prod -o highscore-server .
+RUN v -prod .
 
 FROM alpine:latest
 
-RUN apk --no-cache add sqlite-dev
-
 WORKDIR /app
 COPY --from=build /tmp/app/highscore-server .
 COPY --from=build /tmp/app/config.example.toml ./config.toml

compose.example.yml

@@ -1,15 +0,0 @@
-services:
-  highscore-server:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    image: git.snrd.eu/sunred/highscore-server:latest
-    container_name: highscore-server
-    network_mode: bridge
-    volumes:
-      - ./config.toml:/app/config.toml:ro
-      - ./db:/app/db:rw
-    ports:
-      - "127.0.0.1:8080:8080/tcp"
-      - "[::1]:8080:8080/tcp"
-    restart: unless-stopped

docker.bake.hcl

@@ -1,17 +0,0 @@
-variable "REG" {
-    default = "git.snrd.eu"
-}
-variable "REPO" {
-    default = "sunred/higscore-server"
-}
-variable "TAG" {
-    default = "latest"
-}
-
-group "default" {
-    targets = ["production"]
-}
-target "production" {
-    output = ["type=docker"]
-    tags = ["${REG}/${REPO}:latest", "${REG}/${REPO}:${TAG}"]
-}

src/config.v

@@ -15,10 +15,6 @@ struct Config {
 	db_path string
 }
 
-fn (config Config) copy() Config {
-	return config
-}
-
 fn load_config() Config {
 	config := toml.parse_file(path) or { panic(err) }
 

src/database.v

@@ -8,7 +8,7 @@ pub mut:
 	time	i64
 }
 
-fn (mut app App) create_tables() int {
+fn (mut app App) create_tables() bool {
 	return app.db.exec_none(
 		"CREATE TABLE IF NOT EXISTS ScoreRes (
 			id INTEGER PRIMARY KEY,
@@ -16,7 +16,7 @@ fn (mut app App) create_tables() int {
 			score INTEGER NOT NULL,
 			time SQLITE_INT64_TYPE NOT NULL
 		)"
-	)
+	) == 0
 }
 
 fn (mut app App) insert_score(score ScoreRes) {

src/main.v

@@ -2,64 +2,36 @@ module main
 
 import vweb
 import sqlite
-import time
-import os
 
 struct App {
 	vweb.Context
 pub mut:
 	db sqlite.DB
-	config shared Config
+	config Config
 	is_admin bool
 }
 
 fn main() {
 	mut app := &App{}
-	mut app_config := Config{}
 
-	lock app.config {
 	app.config = load_config()
-		app_config = app.config.copy()
-	}
 
-	if !os.exists(app_config.db_path) {
+	app.db = sqlite.connect(app.config.db_path) or {
-		println("Creating database file at " + app_config.db_path)
+		println('Database Error!')
-		mut file := os.create(app_config.db_path) or { panic(err) }
-		file.close()
-	}
-
-	app.db = sqlite.connect(app_config.db_path) or {
-		println('Database error!')
 		panic(err)
 	}
 
-	sql_code := app.create_tables()
+	app.create_tables()
-
-	if sqlite.is_error(sql_code) {
-		println('Could not create tables!')
-		panic('Error code ' + sql_code.str())
-	}
 
 	mut host := '::'
-	if app_config.host != "" {
-		host = app_config.host
-	}
 
-	// Handle graceful shutdown for Docker
+	if app.config.host != "" {
-	os.signal_opt(os.Signal.int, app.shutdown) or { panic(err) }
+		host = app.config.host
-	os.signal_opt(os.Signal.term, app.shutdown) or { panic(err) }
+	}
 
 	vweb.run_at(app, vweb.RunParams{
 		host: host
-		port: app_config.port
+		port: app.config.port
 		family: .ip6
 	}) or { panic(err) }
 }
-
-fn (mut app App) shutdown(sig os.Signal) {
-	app.db.close() or { panic(err) }
-	println("Shut down database gracefully")
-	println("Exiting...")
-	time.sleep(1e+9) // Sleep one second
-	exit(0)
-}

src/web.v

@@ -4,7 +4,7 @@ import vweb
 import json
 import time
 
-struct ResultStatus {
+struct Status {
 	status int
 	message string
 }
@@ -16,11 +16,9 @@ struct ErrorStatus {
 }
 
 pub fn (mut app App) index() vweb.Result {
-	rlock app.config {
 	if app.config.redirect {
 		app.redirect(app.config.redirect_url)
 	}
-	}
 
 	return app.text("Hello :)")
 }
@@ -71,7 +69,7 @@ pub fn (mut app App) score_submit() vweb.Result {
 	app.insert_score(ScoreRes{player:body.player, score:body.score, time:time.now().unix_time()})
 
 	return app.json(
-		ResultStatus {
+		Status {
 			200,
 			"Success"
 		}
@@ -79,14 +77,10 @@ pub fn (mut app App) score_submit() vweb.Result {
 }
 
 fn (mut app App) auth() bool {
+	app.config = load_config()
+
 	auth_header := app.get_header('Authorization')
 	token := auth_header.after('Bearer ')
 
-	mut config_token := ""
+	return token == app.config.token
-
-	rlock app.config {
-		config_token = app.config.token
-	}
-	
-	return config_token.len != 0 && token == config_token
 }