From 119cdd14d4204367d841fc0e3bd72d411ccb3a63 Mon Sep 17 00:00:00 2001
From: "yakumo.izuru" <yakumo.izuru@e410bdd4-646f-c54f-a7ce-fffcc4f439ae>
Date: Sun, 21 Jan 2024 13:03:02 +0000
Subject: [PATCH] Remove verbose logging, it's no-op with Fiber

Signed-off-by: Izuru Yakumo <yakumo.izuru@chaotic.ninja>

git-svn-id: file:///srv/svn/repo/mai/trunk@65 e410bdd4-646f-c54f-a7ce-fffcc4f439ae
---
 cmd/mai/flag.go |  1 -
 cmd/mai/main.go | 15 ++-------------
 mai.1           |  1 -
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/cmd/mai/flag.go b/cmd/mai/flag.go
index 8e83934..dda2529 100644
--- a/cmd/mai/flag.go
+++ b/cmd/mai/flag.go
@@ -7,6 +7,5 @@ import (
 
 func parseFlags() {
 	flag.StringVar(&configfile, "f", "", "Configuration file")
-	flag.BoolVar(&verbose, "v", false, "Verbose logging")
 	flag.Parse()
 }
diff --git a/cmd/mai/main.go b/cmd/mai/main.go
index 40bf633..609fd31 100644
--- a/cmd/mai/main.go
+++ b/cmd/mai/main.go
@@ -20,7 +20,6 @@ import (
 )
 var (
 	configfile string
-	verbose bool
 )
 var conf struct {
 	group string
@@ -33,9 +32,6 @@ func main() {
 	parseFlags()
 
 	if configfile != "" {
-		if verbose {
-			fmt.Printf("[mai] Reading configuration file")
-		}
 		readConf(configfile)
 	}
 
@@ -45,9 +41,6 @@ func main() {
 	conf.tmplpath = "./views"
 
 	if conf.user != "" {
-		if verbose {
-			fmt.Printf("[mai] Dropping privileges to %s", conf.user)
-		}
 		uid, gid, err := usergroupids(conf.user, conf.group)
 		if err != nil {
 			fmt.Println(err)
@@ -63,7 +56,7 @@ func main() {
 	app := fiber.New(
 		fiber.Config{
 			AppName: "Mai",
-			DisableStartupMessage: true,
+			ServerHeader: "Mai (using Fiber v2.x)",
 			Views: engine,
 	})
 
@@ -262,6 +255,7 @@ func main() {
 		return c.JSON(fiber.Map{
 			"fiberversion": fiber.Version,
 			"goversion": runtime.Version(),
+			"maiversion": mai.FullVersion(),
 		})
 	})
 	app.Post("/switchlanguages", func(c *fiber.Ctx) error {
@@ -287,9 +281,4 @@ func main() {
 		Browse: true,
 	})
 	app.Listen(conf.listen)
-
-	if verbose {
-		fmt.Printf("Starting mai %v\n", mai.FullVersion())
-		fmt.Printf("Listening on %s", conf.listen)
-	}
 }
diff --git a/mai.1 b/mai.1
index 3a52c82..815203e 100644
--- a/mai.1
+++ b/mai.1
@@ -7,7 +7,6 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl f Ar config-file
-.Op Fl v
 .Sh DESCRIPTION
 This project has been forked from the remains of the
 rewrite of the SimplyTranslate project, which is currently