flags.go

@@ -1,23 +1,17 @@
 package main
 
-import (
+import "flag"
-	"flag"
-	"fmt"
-	"os"
-
-	"github.com/rs/zerolog/log"
-)
 
 var (
-	flagLogJson *bool = flag.Bool(
+	flagPrettyPrint *bool = flag.Bool(
-		"jsonlogs",
+		"pretty",
 		false,
-		"If set, writes logging messages as json objects instead",
+		"If set, pretty prints logging entries which would be json objects otherwise",
 	)
 	flagConfigFile *string = flag.String(
 		"config",
 		"config.toml",
-		"Location of the config file",
+		"Location of the config file. Defaults to \"config.toml\"",
 	)
 	flagLogLevel *string = flag.String(
 		"loglevel",
@@ -31,29 +25,6 @@ var (
 	)
 )
 
-func flagUsage() {
-	executable, err := os.Executable()
-	if err != nil {
-		log.Fatal().Err(err).Msg("Failed to get own path")
-	}
-	fmt.Fprintf(os.Stderr, "Usage of %s:\n", executable)
-	fmt.Fprintln(os.Stderr, "\t-config string")
-	fmt.Fprintln(os.Stderr, "\t\tLocation of the config file (default: \"config.toml\")")
-	fmt.Fprintln(os.Stderr, "\t-loglevel string")
-	fmt.Fprintln(
-		os.Stderr,
-		"\t\tSet the logging level. Options are: Trace, Debug, Info, Warning, Error and Fatal. Case insensitive (default: \"Info\")",
-	)
-	fmt.Fprintln(os.Stderr, "\t-validate-config")
-	fmt.Fprintln(
-		os.Stderr,
-		"\t\tIf set, the server will only validate the config (or write the default one) and then quit",
-	)
-	fmt.Fprintln(os.Stderr, "\t-jsonlogs")
-	fmt.Fprintln(os.Stderr, "\t\tIf set, writes logging messages as json objects instead")
-}
-
 func init() {
-	flag.Usage = flagUsage
 	flag.Parse()
 }

main.go

@@ -96,6 +96,7 @@ func main() {
 }
 
 func setLogLevel() {
+	log.Info().Str("new-level", *flagLogLevel).Msg("Attempting to set log level")
 	switch strings.ToLower(*flagLogLevel) {
 	case "trace":
 		zerolog.SetGlobalLevel(zerolog.TraceLevel)
@@ -112,11 +113,10 @@ func setLogLevel() {
 	default:
 		zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	}
-	log.Info().Str("new-level", *flagLogLevel).Msg("New logging level set")
 }
 
 func setLogger(extraLogWriters ...io.Writer) {
-	if !*flagLogJson {
+	if *flagPrettyPrint {
 		console := zerolog.ConsoleWriter{Out: os.Stderr}
 		log.Logger = zerolog.New(zerolog.MultiLevelWriter(append([]io.Writer{console}, extraLogWriters...)...)).
 			With().

server/apiLinstromNotes.go

@@ -3,10 +3,10 @@ package server
 import (
 	"net/http"
 
-	"git.mstar.dev/mstar/goutils/other"
-	"git.mstar.dev/mstar/linstrom/storage"
 	"github.com/google/jsonapi"
 	"github.com/rs/zerolog/hlog"
+	"git.mstar.dev/mstar/goutils/other"
+	"git.mstar.dev/mstar/linstrom/storage"
 )
 
 // Notes
@@ -59,7 +59,7 @@ func linstromGetNote(w http.ResponseWriter, r *http.Request) {
 
 func linstromUpdateNote(w http.ResponseWriter, r *http.Request) {}
 func linstromNewNote(w http.ResponseWriter, r *http.Request) {
-	// store := StorageFromRequest(r)
+	store := StorageFromRequest(r)
 	actorId, ok := ActorIdFromRequest(r)
 	log := hlog.FromRequest(r)
 
@@ -95,7 +95,7 @@ func linstromNewNote(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// _, _ = store.CreateNoteLocal(creatorId string, rawContent string, contentWarning *string, timestamp time.Time, attachmentIds []string, emoteIds []string, repliesToId *string, quotesId *string, accessLevel storage.NoteAccessLevel, tags []string)
+	_, _ = store.CreateNote()
 }
 func linstromDeleteNote(w http.ResponseWriter, r *http.Request) {}