diff --git a/logmessages/logmessages.go b/logmessages/logmessages.go index 3a25b16..8d2c730 100644 --- a/logmessages/logmessages.go +++ b/logmessages/logmessages.go @@ -64,12 +64,14 @@ const ( TimedOut = "timed out" FailedGenericWithCode = "failed (code %d)" - InitDiscord = "Initialized Discord daemon" - FailedInitDiscord = "Failed to initialize Discord daemon: %v" - InitTelegram = "Initialized Telegram daemon" - FailedInitTelegram = "Failed to initialize Telegram daemon: %v" - InitMatrix = "Initialized Matrix daemon" - FailedInitMatrix = "Failed to initialize Matrix daemon: %v" + InitDiscord = "Initialized Discord daemon" + FailedInitDiscord = "Failed to initialize Discord daemon: %v" + InitTelegram = "Initialized Telegram daemon" + FailedInitTelegram = "Failed to initialize Telegram daemon: %v" + InitMatrix = "Initialized Matrix daemon" + FailedInitMatrix = "Failed to initialize Matrix daemon: %v" + InitingMatrixCrypto = "Initializing Matrix encryption store" + InitMatrixCrypto = "Initialized Matrix encryption store" InitRouter = "Initializing router" LoadRoutes = "Loading Routes" diff --git a/matrix.go b/matrix.go index 3147a70..ec6d16a 100644 --- a/matrix.go +++ b/matrix.go @@ -101,7 +101,7 @@ func newMatrixDaemon(app *appContext) (d *MatrixDaemon, err error) { d.languages[id.RoomID(user.RoomID)] = user.Lang } } - err = InitMatrixCrypto(d) + err = InitMatrixCrypto(d, app.info) return } diff --git a/matrix_crypto.go b/matrix_crypto.go index 30416ea..83bd014 100644 --- a/matrix_crypto.go +++ b/matrix_crypto.go @@ -6,6 +6,8 @@ package main import ( "context" + "github.com/hrfee/jfa-go/logger" + lm "github.com/hrfee/jfa-go/logmessages" _ "github.com/mattn/go-sqlite3" "maunium.net/go/mautrix/crypto/cryptohelper" "maunium.net/go/mautrix/event" @@ -22,7 +24,8 @@ func BuildTagsE2EE() { func MatrixE2EE() bool { return true } -func InitMatrixCrypto(d *MatrixDaemon) error { +func InitMatrixCrypto(d *MatrixDaemon, logger *logger.Logger) error { + logger.Printf(lm.InitingMatrixCrypto) d.Encryption = d.app.config.Section("matrix").Key("encryption").MustBool(false) if !d.Encryption { // return fmt.Errorf("encryption disabled") @@ -45,6 +48,7 @@ func InitMatrixCrypto(d *MatrixDaemon) error { d.bot.Crypto = d.crypto.helper d.Encryption = true + logger.Printf(lm.InitMatrixCrypto) return nil } diff --git a/matrix_nocrypto.go b/matrix_nocrypto.go index 8a2f84e..8e0f87d 100644 --- a/matrix_nocrypto.go +++ b/matrix_nocrypto.go @@ -3,7 +3,10 @@ package main -import "maunium.net/go/mautrix/id" +import ( + "github.com/hrfee/jfa-go/logger" + "maunium.net/go/mautrix/id" +) type Crypto struct{} @@ -11,7 +14,7 @@ func BuildTagsE2EE() {} func MatrixE2EE() bool { return false } -func InitMatrixCrypto(d *MatrixDaemon) (err error) { +func InitMatrixCrypto(d *MatrixDaemon, logger *logger.Logger) (err error) { d.Encryption = false return }