Skip to content

📚 The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Improve logs (adding title and summary logs)

Smaug6739fcdae72df5c0
diff --git a/backend/app/minio.go b/backend/app/minio.go
index 8f22dc3b..5fc15344 100644
--- a/backend/app/minio.go
+++ b/backend/app/minio.go
@@ -41,14 +41,14 @@ func MinioConnection() (*minio.Client, *minio.Client, error) {
Secure: isSecure,
})
if errInit != nil {
- logger.Error(fmt.Sprintf("Failed to initialize MinIO client: %v", errInit))
+ logger.Error("s3", fmt.Sprintf("Failed to initialize MinIO client: %v", errInit))
os.Exit(1)
}
// Signer client for public URLs
publicURL, err := url.Parse(publicEndpoint)
if err != nil {
- logger.Error("CONFIG: MINIO_PUBLIC_URL is not a valid URL")
+ logger.Error("s3", "CONFIG: MINIO_PUBLIC_URL is not a valid URL")
os.Exit(1)
}
isPublicSecure := publicURL.Scheme == "https"
@@ -58,8 +58,8 @@ func MinioConnection() (*minio.Client, *minio.Client, error) {
BucketLookup: minio.BucketLookupPath,
})
if err != nil {
- logger.Error(fmt.Sprintf("Failed to create signer client: %v", err))
- logger.Error("Please check your MINIO_PUBLIC_URL is set correctly.")
+ logger.Error("s3", fmt.Sprintf("Failed to create signer client: %v", err))
+ logger.Error("s3", "Please check your MINIO_PUBLIC_URL is set correctly.")
os.Exit(1)
}
@@ -80,13 +80,13 @@ func setupPublicBucket(ctx context.Context, minioClient *minio.Client, bucketNam
if err != nil {
exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
if errBucketExists == nil && exists {
- logger.Info(fmt.Sprintf("We already own %s", bucketName))
+ logger.Info("s3", fmt.Sprintf("We already own %s", bucketName))
} else {
- logger.Error(fmt.Sprintf("Failed to create bucket %s: %v", bucketName, err))
+ logger.Error("s3", fmt.Sprintf("Failed to create bucket %s: %v", bucketName, err))
os.Exit(1)
}
} else {
- logger.Success("Successfully created " + bucketName)
+ logger.Success("s3", "Successfully created "+bucketName)
}
// Set public read policy for user files
@@ -104,10 +104,10 @@ func setupPublicBucket(ctx context.Context, minioClient *minio.Client, bucketNam
err = minioClient.SetBucketPolicy(ctx, bucketName, policy)
if err != nil {
- logger.Error(fmt.Sprintf("Failed to set bucket policy: %v", err))
+ logger.Error("s3", fmt.Sprintf("Failed to set bucket policy: %v", err))
os.Exit(1)
}
- logger.Success("Successfully set public bucket policy for " + bucketName)
+ logger.Success("s3", "Successfully set public bucket policy for "+bucketName)
}
// setupPrivateBackupBucket creates and configures the private backup bucket
@@ -116,13 +116,13 @@ func setupPrivateBackupBucket(ctx context.Context, minioClient *minio.Client, bu
if err != nil {
exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
if errBucketExists == nil && exists {
- logger.Info(fmt.Sprintf("We already own %s", bucketName))
+ logger.Info("s3", fmt.Sprintf("We already own %s", bucketName))
} else {
- logger.Error(fmt.Sprintf("Failed to create private backup bucket %s: %v", bucketName, err))
+ logger.Error("s3", fmt.Sprintf("Failed to create private backup bucket %s: %v", bucketName, err))
os.Exit(1)
}
} else {
- logger.Success("Successfully created private backup bucket: " + bucketName)
+ logger.Success("s3", "Successfully created private backup bucket: "+bucketName)
}
// No public policy - bucket remains private
@@ -142,8 +142,8 @@ func setupPrivateBackupBucket(ctx context.Context, minioClient *minio.Client, bu
err = minioClient.SetBucketLifecycle(ctx, bucketName, lifecycleConfig)
if err != nil {
- logger.Warn(fmt.Sprintf("Failed to set lifecycle policy for backups: %v", err))
+ logger.Warn("s3", fmt.Sprintf("Failed to set lifecycle policy for backups: %v", err))
} else {
- logger.Success("Successfully set lifecycle policy for backups (auto-delete after 24h)")
+ logger.Success("s3", "Successfully set lifecycle policy for backups (auto-delete after 24h)")
}
}
diff --git a/backend/controllers/authentication.controller.go b/backend/controllers/authentication.controller.go
index 71c05cfe..c38c5ba0 100644
--- a/backend/controllers/authentication.controller.go
+++ b/backend/controllers/authentication.controller.go
@@ -2,12 +2,10 @@ package controllers
import (
"alexandrie/app"
- "alexandrie/pkg/logger"
"alexandrie/utils"
"errors"
"net/http"
"os"
- "time"
"github.com/gin-gonic/gin"
)
@@ -23,12 +21,7 @@ type AuthController interface {
}
func NewAuthController(app *app.App) AuthController {
- go func() {
- for {
- deleteOldSessions(app)
- time.Sleep(1 * time.Hour) // Sleep for 1 hour
- }
- }()
+
return &Controller{app: app}
}
@@ -209,15 +202,6 @@ func (ctr *Controller) ResetPassword(c *gin.Context) (int, any) {
return http.StatusOK, "Password reset successfully."
}
-func deleteOldSessions(app *app.App) {
- err := app.Services.Session.DeleteOldSessions()
- if err != nil {
- logger.Error("Sessions: Error during automatic deletion: " + err.Error())
- } else {
- logger.Success("Sessions: Old sessions deleted successfully.")
- }
-}
-
// Cookies security helpers
func shouldUseSecureCookies() bool {
diff --git a/backend/main.go b/backend/main.go
index fac09d8e..3f75d695 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -10,17 +10,17 @@ import (
func main() {
- logger.Info("Initializing Alexandrie backend...")
+ logger.Info("app", "Initializing Alexandrie backend...")
godotenv.Load() // Load .env file if present
port := os.Getenv("BACKEND_PORT")
if port == "" {
- logger.Error("BACKEND_PORT environment variable not set")
+ logger.Error("app", "BACKEND_PORT environment variable not set")
os.Exit(1)
}
server, application := server.SetupServer()
- logger.Info("Starting server on port: " + port)
+ logger.Info("app", "Starting server on port: "+port)
defer application.DB.Close()
server.Run(":" + port)
diff --git a/backend/oidc/config.go b/backend/oidc/config.go
index ba7e1b29..6345e904 100644
--- a/backend/oidc/config.go
+++ b/backend/oidc/config.go
@@ -118,15 +118,15 @@ func (m *Manager) loadFromEnv() {
provider.Name = fmt.Sprintf("provider_%d", i)
}
if err := m.AddProvider(provider); err != nil {
- logger.Error(fmt.Sprintf("Failed to add OIDC provider '%s': %v", provider.Name, err))
+ logger.Error("OIDC", fmt.Sprintf("Failed to add OIDC provider '%s': %v", provider.Name, err))
}
}
count := len(m.providers)
if count > 0 {
- logger.Success(fmt.Sprintf("OIDC: Loaded %d provider(s)", count))
+ logger.Success("OIDC", fmt.Sprintf("Loaded %d provider(s)", count))
} else {
- logger.Info("OIDC: No providers configured")
+ logger.Info("OIDC", "No providers configured")
}
}
@@ -170,7 +170,7 @@ func (m *Manager) AddProvider(provider *Provider) error {
m.providers[providerName] = provider
m.mu.Unlock()
- logger.Info(fmt.Sprintf("OIDC: Added provider '%s' (issuer: %s)", providerName, provider.Issuer))
+ logger.Info("OIDC", fmt.Sprintf("Added provider '%s' (issuer: %s)", providerName, provider.Issuer))
return nil
}
diff --git a/backend/pkg/logger/logger.go b/backend/pkg/logger/logger.go
index b69a410c..fff55541 100644
--- a/backend/pkg/logger/logger.go
+++ b/backend/pkg/logger/logger.go
@@ -27,20 +27,20 @@ func format(level string, color string, msg string) string {
return fmt.Sprintf("%s %s", level, msg)
}
-func Info(msg string) {
- baseLogger.Println(format("info |", blue, msg))
+func Info(title, msg string) {
+ baseLogger.Println(format(title+" |", blue, msg))
}
-func Warn(msg string) {
- baseLogger.Println(format("warn |", yellow, msg))
+func Warn(title, msg string) {
+ baseLogger.Println(format(title+" |", yellow, msg))
}
-func Error(msg string) {
- baseLogger.Println(format("error|", red, msg))
+func Error(title, msg string) {
+ baseLogger.Println(format(title+" |", red, msg))
}
-func Success(msg string) {
- baseLogger.Println(format("success|", green, msg))
+func Success(title, msg string) {
+ baseLogger.Println(format(title+" |", green, msg))
}
// Optionnel : activer/désactiver les couleurs globalement
diff --git a/backend/repositories/manager.go b/backend/repositories/manager.go
index 331c1d33..6b51980d 100644
--- a/backend/repositories/manager.go
+++ b/backend/repositories/manager.go
@@ -24,7 +24,7 @@ func NewRepositoryManager(db *sqlx.DB) (*RepositoryManager, error) {
rm.initializeRepositories()
rm.initialized = true
- logger.Success("Repository manager initialized successfully")
+ logger.Success("Repository manager", "Initialized successfully")
return rm, nil
}
@@ -39,7 +39,7 @@ func (rm *RepositoryManager) initializeRepositories() {
func (rm *RepositoryManager) Close() error {
rm.initialized = false
- logger.Success("Repository manager closed successfully")
+ logger.Success("Repository manager", "Closed successfully")
return rm.db.Close()
}
diff --git a/backend/server/server.go b/backend/server/server.go
index 7dbe4742..2ecf581c 100644
--- a/backend/server/server.go
+++ b/backend/server/server.go
@@ -17,22 +17,19 @@ func SetupServer() (*gin.Engine, *app.App) {
workingDir, err := os.Getwd()
if err != nil {
- logger.Error("Error getting cwd: " + err.Error())
+ logger.Error("server", "Error getting cwd: "+err.Error())
os.Exit(1)
}
absPath := filepath.Join(workingDir, fmt.Sprintf("%sconfig.toml", os.Getenv("CONFIG_CPWD")))
config := app.Config{}
_, err = toml.DecodeFile(absPath, &config)
if err != nil {
- logger.Error("Error loading config: " + err.Error())
+ logger.Error("server", "Error loading config: "+err.Error())
os.Exit(1)
}
- logger.Success("Loaded configuration from: " + absPath + " successfully")
+ logger.Success("server", "Loaded configuration from: "+absPath+" successfully")
- // Initialize the application
application := app.InitApp(config)
-
- // Create Gin router
appRouter := router.InitRouter(application)
return appRouter, application
diff --git a/backend/services/manager.go b/backend/services/manager.go
index 2be4d8e2..8350b8ce 100644
--- a/backend/services/manager.go
+++ b/backend/services/manager.go
@@ -32,7 +32,7 @@ func NewServiceManager(repos *repositories.RepositoryManager, snowflake *snowfla
}
sm.initialized = true
- logger.Success("Service manager initialized successfully")
+ logger.Success("Service manager", "Initialized successfully")
return sm, nil
}
diff --git a/backend/services/session.service.go b/backend/services/session.service.go
index 8c9d4bcf..25013a0a 100644
--- a/backend/services/session.service.go
+++ b/backend/services/session.service.go
@@ -2,13 +2,15 @@ package services
import (
"alexandrie/models"
+ "alexandrie/pkg/logger"
"alexandrie/repositories"
"alexandrie/types"
+ "time"
)
type SessionService interface {
GetSessionsByUserId(userId types.Snowflake) ([]models.Session, error)
- DeleteOldSessions() error
+ DeleteOldSessions()
}
type sessionService struct {
@@ -16,15 +18,27 @@ type sessionService struct {
}
func NewSessionService(sessionRepo repositories.SessionRepository) SessionService {
- return &sessionService{
+ s := &sessionService{
sessionRepo: sessionRepo,
}
+ go func() {
+ for {
+ s.DeleteOldSessions()
+ time.Sleep(1 * time.Hour)
+ }
+ }()
+ return s
}
func (s *sessionService) GetSessionsByUserId(userId types.Snowflake) ([]models.Session, error) {
return s.sessionRepo.GetByUserId(userId)
}
-func (s *sessionService) DeleteOldSessions() error {
- return s.sessionRepo.DeleteOld()
+func (s *sessionService) DeleteOldSessions() {
+ err := s.sessionRepo.DeleteOld()
+ if err != nil {
+ logger.Error("session", "Error during automatic deletion: "+err.Error())
+ } else {
+ logger.Success("session", "Old sessions deleted successfully.")
+ }
}