mstar/linstrom
1
0
Fork 0
Code Issues 27 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move utils into shared folder

Browse source
This commit is contained in:
Melody Becker 2025-04-05 12:21:44 +02:00
parent 500bf48295
commit c25f27e82e
Signed by: mstar
SSH key fingerprint: SHA256:vkXfS9FG2pVNVfvDrzd1VW9n8VJzqqdKQGljxxX8uK8
22 changed files with 111 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

15
storage/storage.go
View file

@ -10,11 +10,12 @@ import (
"fmt"
"github.com/rs/zerolog/log"
"git.mstar.dev/mstar/linstrom/config"
"git.mstar.dev/mstar/linstrom/storage/cache"
"git.mstar.dev/mstar/linstrom/util"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"git.mstar.dev/mstar/linstrom/config"
"git.mstar.dev/mstar/linstrom/shared"
"git.mstar.dev/mstar/linstrom/storage/cache"
)
// Always keep a reference of the server's own RemoteServer entry here
@ -30,7 +31,7 @@ type Storage struct {
}
func NewStorage(dbUrl string, cache *cache.Cache) (*Storage, error) {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
db, err := gorm.Open(postgres.Open(dbUrl), &gorm.Config{
Logger: newGormLogger(log.Logger),
})
@ -73,7 +74,7 @@ func NewStorage(dbUrl string, cache *cache.Cache) (*Storage, error) {
}
func (s *Storage) insertSelfFromConfig() error {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
const ServerActorId = "self"
var err error
@ -139,7 +140,7 @@ func (s *Storage) insertSelfFromConfig() error {
}
func (s *Storage) insertDefaultRoles() error {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
for _, role := range allDefaultRoles {
log.Debug().Str("role-name", role.Name).Msg("Inserting default role")
if err := s.db.FirstOrCreate(role).Error; err != nil {
@ -150,7 +151,7 @@ func (s *Storage) insertDefaultRoles() error {
}
func (s *Storage) insertPlaceholderFile() error {
defer util.Untrace(util.Trace(&log.Logger))
defer shared.Untrace(shared.Trace(&log.Logger))
return s.db.Model(&MediaMetadata{}).Assign(&MediaMetadata{
ID: "placeholder",
Type: "image/webp",