good morning!!!!

Skip to content
Snippets Groups Projects
Commit 9b762a19 authored by Garet Halliday's avatar Garet Halliday
Browse files

oh wow it actually works

parent 5f1de41a
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ package pool ...@@ -2,6 +2,7 @@ package pool
import ( import (
"pggat/lib/bouncer/backends/v0" "pggat/lib/bouncer/backends/v0"
"pggat/lib/fed"
packets "pggat/lib/fed/packets/v3.0" packets "pggat/lib/fed/packets/v3.0"
"pggat/lib/gat/metrics" "pggat/lib/gat/metrics"
"pggat/lib/middleware/middlewares/eqp" "pggat/lib/middleware/middlewares/eqp"
...@@ -42,6 +43,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli ...@@ -42,6 +43,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
clientParams := client.GetInitialParameters() clientParams := client.GetInitialParameters()
serverParams := server.GetInitialParameters() serverParams := server.GetInitialParameters()
var packet fed.Packet
for key, value := range clientParams { for key, value := range clientParams {
// skip already set params // skip already set params
if serverParams[key] == value { if serverParams[key] == value {
...@@ -49,7 +52,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli ...@@ -49,7 +52,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key: key.String(), Key: key.String(),
Value: serverParams[key], Value: serverParams[key],
} }
clientErr = client.GetConn().WritePacket(p.IntoPacket(nil)) packet = p.IntoPacket(packet)
clientErr = client.GetConn().WritePacket(packet)
if clientErr != nil { if clientErr != nil {
return return
} }
...@@ -66,7 +70,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli ...@@ -66,7 +70,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key: key.String(), Key: key.String(),
Value: value, Value: value,
} }
clientErr = client.GetConn().WritePacket(p.IntoPacket(nil)) packet = p.IntoPacket(packet)
clientErr = client.GetConn().WritePacket(packet)
if clientErr != nil { if clientErr != nil {
return return
} }
...@@ -96,7 +101,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli ...@@ -96,7 +101,8 @@ func SyncInitialParameters(options Options, client *Client, server *Server) (cli
Key: key.String(), Key: key.String(),
Value: value, Value: value,
} }
clientErr = client.GetConn().WritePacket(p.IntoPacket(nil)) packet = p.IntoPacket(packet)
clientErr = client.GetConn().WritePacket(packet)
if clientErr != nil { if clientErr != nil {
return return
} }
......
...@@ -12,13 +12,16 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server ...@@ -12,13 +12,16 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
value, hasValue := c.parameters[name] value, hasValue := c.parameters[name]
expected, hasExpected := s.parameters[name] expected, hasExpected := s.parameters[name]
var packet fed.Packet
if value == expected { if value == expected {
if !c.synced { if !c.synced {
ps := packets.ParameterStatus{ ps := packets.ParameterStatus{
Key: name.String(), Key: name.String(),
Value: expected, Value: expected,
} }
if err := client.WritePacket(ps.IntoPacket(nil)); err != nil { packet = ps.IntoPacket(packet)
if err := client.WritePacket(packet); err != nil {
return err return err
} }
} }
...@@ -49,7 +52,8 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server ...@@ -49,7 +52,8 @@ func sync(tracking []strutil.CIString, client fed.ReadWriter, c *Client, server
Key: name.String(), Key: name.String(),
Value: expected, Value: expected,
} }
if err := client.WritePacket(ps.IntoPacket(nil)); err != nil { packet = ps.IntoPacket(packet)
if err := client.WritePacket(packet); err != nil {
return err return err
} }
} }
......
...@@ -13,7 +13,7 @@ type Capturer struct { ...@@ -13,7 +13,7 @@ type Capturer struct {
} }
func (T *Capturer) WritePacket(packet fed.Packet) error { func (T *Capturer) WritePacket(packet fed.Packet) error {
T.Packets = append(T.Packets, packet) T.Packets = append(T.Packets, bytes.Clone(packet))
return nil return nil
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment