mirror of https://github.com/mautrix/go.git
Drop maulogger support
parent
2728a8f8aa
commit
94246ffc85
|
@ -1,5 +1,7 @@
|
||||||
## v0.18.0 (unreleased)
|
## v0.18.0 (unreleased)
|
||||||
|
|
||||||
|
* **Breaking change *(client, bridge, appservice)*** Dropped support for
|
||||||
|
maulogger. Only zerolog loggers are now provided by default.
|
||||||
* *(bridge)* Fixed upload size limit not having a default if the server
|
* *(bridge)* Fixed upload size limit not having a default if the server
|
||||||
returned no value.
|
returned no value.
|
||||||
* *(synapseadmin)* Added wrappers for some room and user admin APIs.
|
* *(synapseadmin)* Added wrappers for some room and user admin APIs.
|
||||||
|
|
|
@ -24,7 +24,6 @@ import (
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"golang.org/x/net/publicsuffix"
|
"golang.org/x/net/publicsuffix"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
"maunium.net/go/maulogger/v2/maulogadapt"
|
|
||||||
|
|
||||||
"maunium.net/go/mautrix"
|
"maunium.net/go/mautrix"
|
||||||
"maunium.net/go/mautrix/event"
|
"maunium.net/go/mautrix/event"
|
||||||
|
@ -355,7 +354,7 @@ func (as *AppService) SetHomeserverURL(homeserverURL string) error {
|
||||||
// This does not do any validation, and it does not cache the client.
|
// This does not do any validation, and it does not cache the client.
|
||||||
// Usually you should prefer [AppService.Client] or [AppService.Intent] over this method.
|
// Usually you should prefer [AppService.Client] or [AppService.Intent] over this method.
|
||||||
func (as *AppService) NewMautrixClient(userID id.UserID) *mautrix.Client {
|
func (as *AppService) NewMautrixClient(userID id.UserID) *mautrix.Client {
|
||||||
client := &mautrix.Client{
|
return &mautrix.Client{
|
||||||
HomeserverURL: as.hsURLForClient,
|
HomeserverURL: as.hsURLForClient,
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
SetAppServiceUserID: true,
|
SetAppServiceUserID: true,
|
||||||
|
@ -366,8 +365,6 @@ func (as *AppService) NewMautrixClient(userID id.UserID) *mautrix.Client {
|
||||||
Client: as.HTTPClient,
|
Client: as.HTTPClient,
|
||||||
DefaultHTTPRetries: as.DefaultHTTPRetries,
|
DefaultHTTPRetries: as.DefaultHTTPRetries,
|
||||||
}
|
}
|
||||||
client.Logger = maulogadapt.ZeroAsMau(&client.Log)
|
|
||||||
return client
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewExternalMautrixClient creates a new [mautrix.Client] instance for an external user,
|
// NewExternalMautrixClient creates a new [mautrix.Client] instance for an external user,
|
||||||
|
|
|
@ -29,8 +29,6 @@ import (
|
||||||
"go.mau.fi/util/exzerolog"
|
"go.mau.fi/util/exzerolog"
|
||||||
"gopkg.in/yaml.v3"
|
"gopkg.in/yaml.v3"
|
||||||
flag "maunium.net/go/mauflag"
|
flag "maunium.net/go/mauflag"
|
||||||
"maunium.net/go/maulogger/v2"
|
|
||||||
"maunium.net/go/maulogger/v2/maulogadapt"
|
|
||||||
|
|
||||||
"maunium.net/go/mautrix"
|
"maunium.net/go/mautrix"
|
||||||
"maunium.net/go/mautrix/appservice"
|
"maunium.net/go/mautrix/appservice"
|
||||||
|
@ -201,8 +199,6 @@ type Bridge struct {
|
||||||
Crypto Crypto
|
Crypto Crypto
|
||||||
CryptoPickleKey string
|
CryptoPickleKey string
|
||||||
|
|
||||||
// Deprecated: Switch to ZLog
|
|
||||||
Log maulogger.Logger
|
|
||||||
ZLog *zerolog.Logger
|
ZLog *zerolog.Logger
|
||||||
|
|
||||||
MediaConfig mautrix.RespMediaConfig
|
MediaConfig mautrix.RespMediaConfig
|
||||||
|
@ -536,7 +532,6 @@ func (br *Bridge) init() {
|
||||||
os.Exit(12)
|
os.Exit(12)
|
||||||
}
|
}
|
||||||
exzerolog.SetupDefaults(br.ZLog)
|
exzerolog.SetupDefaults(br.ZLog)
|
||||||
br.Log = maulogadapt.ZeroAsMau(br.ZLog)
|
|
||||||
|
|
||||||
br.DoublePuppet = &doublePuppetUtil{br: br, log: br.ZLog.With().Str("component", "double puppet").Logger()}
|
br.DoublePuppet = &doublePuppetUtil{br: br, log: br.ZLog.With().Str("component", "double puppet").Logger()}
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"maunium.net/go/maulogger/v2"
|
|
||||||
|
|
||||||
"maunium.net/go/mautrix"
|
"maunium.net/go/mautrix"
|
||||||
"maunium.net/go/mautrix/appservice"
|
"maunium.net/go/mautrix/appservice"
|
||||||
|
@ -38,8 +37,6 @@ type Event struct {
|
||||||
ReplyTo id.EventID
|
ReplyTo id.EventID
|
||||||
Ctx context.Context
|
Ctx context.Context
|
||||||
ZLog *zerolog.Logger
|
ZLog *zerolog.Logger
|
||||||
// Deprecated: switch to ZLog
|
|
||||||
Log maulogger.Logger
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// MainIntent returns the intent to use when replying to the command.
|
// MainIntent returns the intent to use when replying to the command.
|
||||||
|
|
|
@ -12,7 +12,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"maunium.net/go/maulogger/v2/maulogadapt"
|
|
||||||
|
|
||||||
"maunium.net/go/mautrix/bridge"
|
"maunium.net/go/mautrix/bridge"
|
||||||
"maunium.net/go/mautrix/id"
|
"maunium.net/go/mautrix/id"
|
||||||
|
@ -91,7 +90,6 @@ func (proc *Processor) Handle(ctx context.Context, roomID id.RoomID, eventID id.
|
||||||
ReplyTo: replyTo,
|
ReplyTo: replyTo,
|
||||||
Ctx: ctx,
|
Ctx: ctx,
|
||||||
ZLog: &log,
|
ZLog: &log,
|
||||||
Log: maulogadapt.ZeroAsMau(&log),
|
|
||||||
}
|
}
|
||||||
log.Debug().Msg("Received command")
|
log.Debug().Msg("Received command")
|
||||||
|
|
||||||
|
|
|
@ -119,7 +119,7 @@ func (br *Bridge) PingServer() (start, serverTs, end time.Time) {
|
||||||
}
|
}
|
||||||
start = time.Now()
|
start = time.Now()
|
||||||
var resp wsPingData
|
var resp wsPingData
|
||||||
br.Log.Debugln("Pinging appservice websocket")
|
br.ZLog.Debug().Msg("Pinging appservice websocket")
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
err := br.AS.RequestWebsocket(ctx, &appservice.WebsocketRequest{
|
err := br.AS.RequestWebsocket(ctx, &appservice.WebsocketRequest{
|
||||||
|
|
20
client.go
20
client.go
|
@ -19,7 +19,6 @@ import (
|
||||||
|
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
"go.mau.fi/util/retryafter"
|
"go.mau.fi/util/retryafter"
|
||||||
"maunium.net/go/maulogger/v2/maulogadapt"
|
|
||||||
|
|
||||||
"maunium.net/go/mautrix/crypto/backup"
|
"maunium.net/go/mautrix/crypto/backup"
|
||||||
"maunium.net/go/mautrix/event"
|
"maunium.net/go/mautrix/event"
|
||||||
|
@ -49,17 +48,6 @@ type VerificationHelper interface {
|
||||||
ConfirmSAS(ctx context.Context, txnID id.VerificationTransactionID) error
|
ConfirmSAS(ctx context.Context, txnID id.VerificationTransactionID) error
|
||||||
}
|
}
|
||||||
|
|
||||||
// Deprecated: switch to zerolog
|
|
||||||
type Logger interface {
|
|
||||||
Debugfln(message string, args ...interface{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Deprecated: switch to zerolog
|
|
||||||
type WarnLogger interface {
|
|
||||||
Logger
|
|
||||||
Warnfln(message string, args ...interface{})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Client represents a Matrix client.
|
// Client represents a Matrix client.
|
||||||
type Client struct {
|
type Client struct {
|
||||||
HomeserverURL *url.URL // The base homeserver URL
|
HomeserverURL *url.URL // The base homeserver URL
|
||||||
|
@ -75,8 +63,6 @@ type Client struct {
|
||||||
Verification VerificationHelper
|
Verification VerificationHelper
|
||||||
|
|
||||||
Log zerolog.Logger
|
Log zerolog.Logger
|
||||||
// Deprecated: switch to the zerolog instance in Log
|
|
||||||
Logger Logger
|
|
||||||
|
|
||||||
RequestHook func(req *http.Request)
|
RequestHook func(req *http.Request)
|
||||||
ResponseHook func(req *http.Request, resp *http.Response, duration time.Duration)
|
ResponseHook func(req *http.Request, resp *http.Response, duration time.Duration)
|
||||||
|
@ -2295,7 +2281,7 @@ func NewClient(homeserverURL string, userID id.UserID, accessToken string) (*Cli
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
cli := &Client{
|
return &Client{
|
||||||
AccessToken: accessToken,
|
AccessToken: accessToken,
|
||||||
UserAgent: DefaultUserAgent,
|
UserAgent: DefaultUserAgent,
|
||||||
HomeserverURL: hsURL,
|
HomeserverURL: hsURL,
|
||||||
|
@ -2307,7 +2293,5 @@ func NewClient(homeserverURL string, userID id.UserID, accessToken string) (*Cli
|
||||||
// The client will work with this storer: it just won't remember across restarts.
|
// The client will work with this storer: it just won't remember across restarts.
|
||||||
// In practice, a database backend should be used.
|
// In practice, a database backend should be used.
|
||||||
Store: NewMemorySyncStore(),
|
Store: NewMemorySyncStore(),
|
||||||
}
|
}, nil
|
||||||
cli.Logger = maulogadapt.ZeroAsMau(&cli.Log)
|
|
||||||
return cli, nil
|
|
||||||
}
|
}
|
||||||
|
|
1
go.mod
1
go.mod
|
@ -19,7 +19,6 @@ require (
|
||||||
golang.org/x/net v0.22.0
|
golang.org/x/net v0.22.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
maunium.net/go/mauflag v1.0.0
|
maunium.net/go/mauflag v1.0.0
|
||||||
maunium.net/go/maulogger/v2 v2.4.1
|
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
|
2
go.sum
2
go.sum
|
@ -60,5 +60,3 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
|
maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
|
||||||
maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
|
maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
|
||||||
maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
|
|
||||||
maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
|
|
||||||
|
|
Loading…
Reference in New Issue