Progress meow
This commit is contained in:
parent
490b788e7b
commit
814316ab1e
11 changed files with 279 additions and 35 deletions
44
main.go
44
main.go
|
@ -1,6 +1,7 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"io"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
|
@ -8,13 +9,12 @@ import (
|
|||
"github.com/rs/zerolog/log"
|
||||
"gitlab.com/mstarongitlab/linstrom/ap"
|
||||
"gitlab.com/mstarongitlab/linstrom/config"
|
||||
"gitlab.com/mstarongitlab/linstrom/storage"
|
||||
"gitlab.com/mstarongitlab/linstrom/storage/cache"
|
||||
)
|
||||
|
||||
func main() {
|
||||
if *flagPrettyPrint {
|
||||
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
|
||||
log.Info().Msg("Pretty logging enabled")
|
||||
}
|
||||
setLogger()
|
||||
setLogLevel()
|
||||
if err := config.ReadAndWriteToGlobal(*flagConfigFile); err != nil {
|
||||
log.Fatal().
|
||||
|
@ -22,12 +22,32 @@ func main() {
|
|||
Str("config-file", *flagConfigFile).
|
||||
Msg("Failed to read config and couldn't write default")
|
||||
}
|
||||
// "@aufricus_athudath@activitypub.academy"
|
||||
res, err := ap.GetAccountWebfinger("@aufricus_athudath@activitypub.academy")
|
||||
log.Info().
|
||||
Err(err).
|
||||
Any("webfinger", res).
|
||||
Msg("Webfinger request result for @aufricus_athudath@activitypub.academy")
|
||||
storageCache, err := cache.NewCache(
|
||||
config.GlobalConfig.Storage.MaxInMemoryCacheSize,
|
||||
config.GlobalConfig.Storage.RedisUrl,
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal().Err(err).Msg("Failed to start cache")
|
||||
}
|
||||
var store *storage.Storage
|
||||
if config.GlobalConfig.Storage.DbIsPostgres != nil &&
|
||||
*config.GlobalConfig.Storage.DbIsPostgres {
|
||||
store, err = storage.NewStoragePostgres(
|
||||
config.GlobalConfig.Storage.DatabaseUrl,
|
||||
storageCache,
|
||||
)
|
||||
} else {
|
||||
store, err = storage.NewStorageSqlite(config.GlobalConfig.Storage.DatabaseUrl, storageCache)
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal().Err(err).Msg("Failed to setup storage")
|
||||
}
|
||||
_ = store
|
||||
}
|
||||
|
||||
func setLogLevel() {
|
||||
|
@ -49,3 +69,17 @@ func setLogLevel() {
|
|||
zerolog.SetGlobalLevel(zerolog.InfoLevel)
|
||||
}
|
||||
}
|
||||
|
||||
func setLogger(extraLogWriters ...io.Writer) {
|
||||
if *flagPrettyPrint {
|
||||
console := zerolog.ConsoleWriter{Out: os.Stderr}
|
||||
log.Logger = zerolog.New(zerolog.MultiLevelWriter(append([]io.Writer{console}, extraLogWriters...)...)).
|
||||
With().
|
||||
Timestamp().
|
||||
Logger()
|
||||
} else {
|
||||
log.Logger = zerolog.New(zerolog.MultiLevelWriter(
|
||||
append([]io.Writer{log.Logger}, extraLogWriters...)...,
|
||||
)).With().Timestamp().Logger()
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue