From 9fbbcd48a8e717198dc8e00aef7bc873ed498285 Mon Sep 17 00:00:00 2001
From: Stefan Schallerl <stefan@schallerl.com>
Date: Fri, 7 Feb 2025 16:36:45 +0100
Subject: [PATCH] Adds logging.

---
 .../main/kotlin/net/h34t/filemure/FilemureApp.kt    |   1 -
 app/src/main/kotlin/net/h34t/filemure/Server.kt     |   9 ++++++---
 .../src/main/resources/public}/favicon.png          | Bin
 .../src/main/resources/public}/filemure.css         |   0
 .../src/main/resources/public}/filemure.js          |   0
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename {public => app/src/main/resources/public}/favicon.png (100%)
 rename {public => app/src/main/resources/public}/filemure.css (100%)
 rename {public => app/src/main/resources/public}/filemure.js (100%)

diff --git a/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt b/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt
index 34b28eb..8709755 100644
--- a/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt
+++ b/app/src/main/kotlin/net/h34t/filemure/FilemureApp.kt
@@ -21,7 +21,6 @@ class FilemureApp(repository: SqliteRepository) {
 
     fun register(server: Javalin) {
         server.beforeMatched { ctx ->
-            println(ctx.req().pathInfo)
             val userRole = getUserRole(ctx)
             if (ctx.routeRoles().isNotEmpty() && !ctx.routeRoles().contains(userRole)) {
                 ctx.redirectPRG("/login")
diff --git a/app/src/main/kotlin/net/h34t/filemure/Server.kt b/app/src/main/kotlin/net/h34t/filemure/Server.kt
index a5eaf4a..2c6f1b6 100644
--- a/app/src/main/kotlin/net/h34t/filemure/Server.kt
+++ b/app/src/main/kotlin/net/h34t/filemure/Server.kt
@@ -9,9 +9,12 @@ import org.eclipse.jetty.server.session.DefaultSessionCache
 import org.eclipse.jetty.server.session.FileSessionDataStore
 import org.eclipse.jetty.server.session.SessionHandler
 import java.io.File
-
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 fun main() {
+    val dtf = DateTimeFormatter.ISO_DATE_TIME
+
     val db = System.getenv("dbpath")
         ?: throw IllegalArgumentException("Please define an env dbpath, e.g. /data/filemure.db")
 
@@ -22,11 +25,11 @@ fun main() {
             config.staticFiles.add { staticFiles ->
                 staticFiles.hostedPath = "/"
                 staticFiles.directory = "./public"
-                staticFiles.location = Location.EXTERNAL
+                staticFiles.location = Location.CLASSPATH
             }
 
             config.requestLogger.http { ctx, ms ->
-                // log things here
+                println("${dtf.format(LocalDateTime.now())}\t${ctx.method()}\t${ctx.path()}\t$ms")
             }
 
             config.useVirtualThreads = true
diff --git a/public/favicon.png b/app/src/main/resources/public/favicon.png
similarity index 100%
rename from public/favicon.png
rename to app/src/main/resources/public/favicon.png
diff --git a/public/filemure.css b/app/src/main/resources/public/filemure.css
similarity index 100%
rename from public/filemure.css
rename to app/src/main/resources/public/filemure.css
diff --git a/public/filemure.js b/app/src/main/resources/public/filemure.js
similarity index 100%
rename from public/filemure.js
rename to app/src/main/resources/public/filemure.js