log with prefix

cmd/photos-api/main.go

@@ -20,7 +20,6 @@ var (
 	mysqlUser           = getEnv("MYSQL_USER", "photos")
 	mysqlPassword       = getEnv("MYSQL_PASSWD", "photos")
 	mysqlDatabase       = getEnv("MYSQL_DB", "photos")
-	logger              = log.New(os.Stderr, "[Photos] ", log.LstdFlags)
 	getEnvConfig        = false
 	getCurrentEnvConfig = false
 )
@@ -86,8 +85,10 @@ func main() {
 		return
 	}
 
-	if err := api.New(logger, config).Run(); err != nil {
+	p := api.New(config)
-		logger.Fatal(err)
+
+	if err := p.Run(); err != nil {
+		log.Fatal(err)
 	}
 
 }

internal/photos/api/db.go

@@ -35,7 +35,7 @@ func (s *Service) DBConnect() {
 	})
 
 	if err != nil {
-		s.Logger.Fatal(err)
+		s.LogErr.Fatal("DB", err)
 	}
 
 	s.DB = db

internal/photos/api/dump.go

@@ -11,5 +11,5 @@ func (s *Service) Dump(o interface{}) {
 	enc.SetIndent("", "  ")
 	enc.Encode(o)
 
-	s.Logger.Printf("%s", b.Bytes())
+	s.LogOk.Printf("Dump", "%s", b.Bytes())
 }

internal/photos/api/logger.go

@@ -0,0 +1,34 @@
+package api
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"time"
+)
+
+var logTimeFmt = "2006/01/02 - 15:04:05"
+
+type Logger struct {
+	out    io.StringWriter
+	prefix string
+}
+
+func (l *Logger) Print(prefix string, a ...interface{}) {
+	t := time.Now().UTC()
+	l.out.WriteString(fmt.Sprintf("[%s] %s | [%s] | %s\n", l.prefix, t.Format(logTimeFmt), prefix, fmt.Sprint(a...)))
+}
+
+func (l *Logger) Printf(prefix string, format string, a ...interface{}) {
+	l.Print(prefix, fmt.Sprintf(format, a...))
+}
+
+func (l *Logger) Fatal(prefix string, a ...interface{}) {
+	l.Print(prefix, a...)
+	os.Exit(1)
+}
+
+func (l *Logger) Fatalf(prefix string, format string, a ...interface{}) {
+	l.Printf(prefix, format, a...)
+	os.Exit(1)
+}

internal/photos/api/main.go

@@ -19,7 +19,8 @@ type Service struct {
 	Gin        *gin.Engine
 	DB         *gorm.DB
 	Config     *ServiceConfig
-	Logger     *log.Logger
+	LogOk      *Logger
+	LogErr     *Logger
 	GormLogger gormlogger.Interface
 }
 
@@ -28,11 +29,12 @@ type ServiceConfig struct {
 	Mysql  *gomysql.Config
 }
 
-func New(logger *log.Logger, config *ServiceConfig) *Service {
+func New(config *ServiceConfig) *Service {
 	return &Service{
 		Gin:    gin.New(),
 		Config: config,
-		Logger: logger,
+		LogOk:  &Logger{os.Stdout, "Photos"},
+		LogErr: &Logger{os.Stderr, "Photos"},
 		GormLogger: gormlogger.New(
 			log.New(os.Stdout, "\r\n", log.LstdFlags), // io writer
 			gormlogger.Config{
@@ -55,16 +57,23 @@ func (s *Service) SetupRoutes() {
 	ac.POST("/login", s.Login)
 	ac.GET("/logout", s.RequireAuthToken, s.Logout)
 
+	s.Gin.GET("/me", s.RequireSession, func(c *gin.Context) {
+		c.JSON(http.StatusOK, gin.H{
+			"status": "success",
+			"user":   s.CurrentSession(c).Account.Login,
+		})
+	})
+
 	s.Gin.NoRoute(func(c *gin.Context) {
 		s.Error(c, http.StatusNotFound, ErrReqNotFound)
 	})
-
 }
 
 func (s *Service) Run() error {
 	rand.Seed(time.Now().UnixNano())
 	s.SetupRoutes()
 	s.SetupDB()
+	go s.SessionCleaner()
 
 	srv := &http.Server{
 		Addr:    s.Config.Listen,
@@ -84,7 +93,7 @@ func (s *Service) Run() error {
 	// a timeout of 5 seconds.
 	signal.Notify(quit, os.Interrupt)
 	<-quit
-	s.Logger.Print("shutdown ...")
+	s.LogOk.Print("Exit", "shutdown ...")
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
@@ -96,11 +105,11 @@ func (s *Service) Run() error {
 	if err != nil {
 		return err
 	}
-	s.Logger.Print("closing database ...")
+	s.LogOk.Print("Exit", "closing database ...")
 	if err := db.Close(); err != nil {
 		return err
 	}
 
-	s.Logger.Print("exiting")
+	s.LogOk.Print("Exit", "exiting")
 	return runError
 }

internal/photos/api/recovery.go

@@ -9,7 +9,7 @@ import (
 func (s *Service) Recovery(c *gin.Context) {
 	defer func() {
 		if err := recover(); err != nil {
-			s.Logger.Print("[PANIC]", err)
+			s.LogErr.Print("PANIC", err)
 			s.Error(c, http.StatusInternalServerError, ErrUnexpected)
 		}
 	}()

internal/photos/api/session.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"gitlab.celogeek.com/photos/api/internal/photos/models"
@@ -40,6 +41,20 @@ func (s *Service) RequireSession(c *gin.Context) {
 		return
 	}
 	s.DB.Select("updated_at").Save(sess)
-	s.Logger.Printf("User: %s", sess.Account.Login)
+	s.LogOk.Printf("Session", "User: %s", sess.Account.Login)
 	c.Set("session", sess)
 }
+
+func (s *Service) CurrentSession(c *gin.Context) *models.Session {
+	return c.MustGet("session").(*models.Session)
+}
+
+func (s *Service) SessionCleaner() {
+	for range time.Tick(time.Minute) {
+		t := time.Now().UTC().Add(-3 * time.Hour).Truncate(time.Minute)
+		s.LogOk.Printf("Session", "Cleaning old session < %s", t)
+		if err := s.DB.Where("updated_at < ?", t).Delete(&models.Session{}).Error; err != nil {
+			s.LogErr.Printf("Session", "Cleaning failed: %s", err)
+		}
+	}
+}

internal/photos/models/photo.go

@@ -0,0 +1,6 @@
+package models
+
+type Photo struct {
+	ID   uint32 `gorm:"primary_key"`
+	File string
+}