Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Minor enhancement of coordinator log messages #898

Merged
merged 1 commit into from
Jan 2, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions cmd/worldmock/worldmock.go
Original file line number Diff line number Diff line change
@@ -76,11 +76,6 @@ func (w *WorldMock) serv(netconn net.Conn) error {
return err
}

spqrlog.Zero.Info().
Str("user", cl.Usr()).
Str("db", cl.DB()).
Msg("initialized client connection")

if err := cl.AssignRule(&config.FrontendRule{
AuthRule: &config.AuthCfg{
Method: config.AuthOK,
10 changes: 9 additions & 1 deletion coordinator/provider/coordinator.go
Original file line number Diff line number Diff line change
@@ -1769,6 +1769,13 @@ func (qc *qdbCoordinator) PrepareClient(nconn net.Conn, pt port.RouterPortType)
if pt == port.UnixSocketPortType {
tlsconfig = nil
}

spqrlog.Zero.Info().
Str("user", cl.Usr()).
Str("db", cl.DB()).
Bool("ssl", tlsconfig != nil).
Msg("init client connection...")

if err := cl.Init(tlsconfig); err != nil {
return nil, err
}
@@ -1780,7 +1787,8 @@ func (qc *qdbCoordinator) PrepareClient(nconn net.Conn, pt port.RouterPortType)
spqrlog.Zero.Info().
Str("user", cl.Usr()).
Str("db", cl.DB()).
Msg("initialized client connection")
Bool("ssl", tlsconfig != nil).
Msg("init client connection OK")

var authRule *config.AuthCfg
if config.CoordinatorConfig().Auth != nil {
4 changes: 0 additions & 4 deletions router/client/client.go
Original file line number Diff line number Diff line change
@@ -654,10 +654,6 @@ func (cl *PsqlClient) AssignRule(rule *config.FrontendRule) error {

// startup + ssl/cancel
func (cl *PsqlClient) Init(tlsconfig *tls.Config) error {
spqrlog.Zero.Info().
Bool("ssl", tlsconfig != nil).
Msg("init client connection")

for {
var backend *pgproto3.Backend

Loading