Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e8ba7f7390 | ||
|
|
5d05592a90 | ||
|
|
ae081b12df | ||
|
|
c69acecfd7 |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 36 KiB |
55
main.go
55
main.go
@@ -3,13 +3,13 @@ package main
|
||||
import (
|
||||
"crypto/rand"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"html/template"
|
||||
"path/filepath"
|
||||
"log"
|
||||
"net"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
@@ -22,8 +22,6 @@ const (
|
||||
startTimeKey contextKey = "startTime"
|
||||
)
|
||||
|
||||
type contextKey string
|
||||
|
||||
var (
|
||||
debug = false
|
||||
templates = make(map[string]*template.Template)
|
||||
@@ -32,26 +30,7 @@ var (
|
||||
mu sync.Mutex
|
||||
)
|
||||
|
||||
func initConfig() {
|
||||
// 1. Counter-Pfad auslesen
|
||||
if envFile := os.Getenv("COUNTER_FILE"); envFile != "" {
|
||||
counterFile = envFile
|
||||
log.Printf("counterFile st to %s, by ENV\n", envFile)
|
||||
// Prüfen, ob das Verzeichnis für die Datei existiert
|
||||
dir := filepath.Dir(counterFile)
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
log.Printf("WARNUNG: Verzeichnis %s existiert nicht. Counter wird evtl. fehlschlagen.", dir)
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Debug-Modus auslesen (String zu Bool)
|
||||
envDebug := strings.ToLower(os.Getenv("DEBUG"))
|
||||
if envDebug == "true" || envDebug == "1" {
|
||||
debug = true
|
||||
log.Println("DEBUG-Modus ist aktiviert")
|
||||
}
|
||||
}
|
||||
|
||||
type contextKey string
|
||||
type responseWriter struct {
|
||||
http.ResponseWriter
|
||||
statusCode int
|
||||
@@ -66,6 +45,24 @@ func newResponseWriter(w http.ResponseWriter) *responseWriter {
|
||||
return &responseWriter{w, http.StatusOK} // Default 200 OK
|
||||
}
|
||||
|
||||
func initConfig() {
|
||||
if envFile := os.Getenv("COUNTER_FILE"); envFile != "" {
|
||||
counterFile = envFile
|
||||
log.Printf("counterFile st to %s, by ENV\n", envFile)
|
||||
// Prüfen, ob das Verzeichnis für die Datei existiert
|
||||
dir := filepath.Dir(counterFile)
|
||||
if _, err := os.Stat(dir); os.IsNotExist(err) {
|
||||
log.Printf("WARNUNG: Verzeichnis %s existiert nicht. Counter wird evtl. fehlschlagen.", dir)
|
||||
}
|
||||
}
|
||||
|
||||
envDebug := strings.ToLower(os.Getenv("DEBUG"))
|
||||
if envDebug == "true" || envDebug == "1" {
|
||||
debug = true
|
||||
log.Println("DEBUG-Modus ist aktiviert")
|
||||
}
|
||||
}
|
||||
|
||||
func LoggingMiddleware(next http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
start := time.Now()
|
||||
@@ -141,7 +138,6 @@ func IncrementPasswordCount() {
|
||||
}
|
||||
|
||||
func loadTemplates() {
|
||||
// 1. FuncMap definieren
|
||||
funcMap := template.FuncMap{
|
||||
"getAppVersion": func() string { return AppVersion },
|
||||
"getPassCount": func() int { return GetPasswordCount() },
|
||||
@@ -153,8 +149,6 @@ func loadTemplates() {
|
||||
},
|
||||
}
|
||||
|
||||
// 2. Templates mit FuncMap laden
|
||||
// Wir nutzen New("base.html"), da base.html meist das Haupt-Layout definiert
|
||||
templates["index.html"] = template.Must(template.New("base.html").Funcs(funcMap).ParseFiles(
|
||||
"templates/base.html",
|
||||
"templates/index.html",
|
||||
@@ -212,13 +206,6 @@ func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte(password))
|
||||
}
|
||||
|
||||
type PageData struct {
|
||||
Title string
|
||||
StartTime time.Time
|
||||
Request *http.Request
|
||||
Data interface{} // Deine eigentlichen Seitendaten
|
||||
}
|
||||
|
||||
func indexHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if debug {
|
||||
log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL)
|
||||
|
||||
@@ -3,6 +3,9 @@ services:
|
||||
image: gitea.scu.si/florian.walther/password-generator:latest
|
||||
container_name: password-generator
|
||||
restart: always
|
||||
environment:
|
||||
- DEBUG=false
|
||||
- COUNTER_FILE=/data/counter.txt
|
||||
volumes:
|
||||
- ./app_data:/data
|
||||
ports:
|
||||
|
||||
@@ -70,6 +70,9 @@
|
||||
<!-- <footer>Version: {{getAppVersion}} | made with golang and ♥️ {{ block "footer" . }}{{ end }}</footer> -->
|
||||
<footer>
|
||||
<div class="footer-container">
|
||||
<div class="footer-item">
|
||||
<span>Ladezeit: {{dt .StartTime}}</span>
|
||||
</div>
|
||||
<div class="footer-item">
|
||||
Passwörter generiert: <span id="global-counter">{{getPassCount}}</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user