slight improvements to debug logging.

This commit is contained in:
fiatjaf
2023-04-11 07:10:05 -03:00
parent e103c99bb8
commit 4507477486
3 changed files with 9 additions and 5 deletions

View File

@@ -160,6 +160,7 @@ func (r *Relay) Connect(ctx context.Context) error {
switch command {
case "NOTICE":
DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
var content string
json.Unmarshal(jsonMessage[1], &content)
go func() {
@@ -170,6 +171,7 @@ func (r *Relay) Connect(ctx context.Context) error {
r.mutex.RUnlock()
}()
case "AUTH":
DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
var challenge string
json.Unmarshal(jsonMessage[1], &challenge)
go func() {
@@ -226,6 +228,7 @@ func (r *Relay) Connect(ctx context.Context) error {
if len(jsonMessage) < 2 {
continue
}
DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
var subId string
json.Unmarshal(jsonMessage[1], &subId)
if subscription, ok := r.subscriptions.Load(subId); ok {
@@ -237,6 +240,7 @@ func (r *Relay) Connect(ctx context.Context) error {
if len(jsonMessage) < 3 {
continue
}
DebugLogger.Printf("{%s} %v\n", r.URL, jsonMessage)
var (
eventId string
ok bool
@@ -249,8 +253,6 @@ func (r *Relay) Connect(ctx context.Context) error {
json.Unmarshal(jsonMessage[3], &msg)
}
DebugLogger.Printf("{%s} OK: %s %v %s\n", r.URL, eventId, ok, msg)
if okCallback, exist := r.okCallbacks.Load(eventId); exist {
okCallback(ok, msg)
}
@@ -373,7 +375,9 @@ func (r *Relay) Auth(ctx context.Context, event Event) (Status, error) {
defer r.okCallbacks.Delete(event.ID)
// send AUTH
if err := r.Connection.WriteJSON([]interface{}{"AUTH", event}); err != nil {
authResponse := []interface{}{"AUTH", event}
DebugLogger.Printf("{%s} sending %v\n", r.URL, authResponse)
if err := r.Connection.WriteJSON(authResponse); err != nil {
// status will be "failed"
return status, err
}

View File

@@ -68,7 +68,7 @@ func (sub *Subscription) Fire() error {
message = append(message, filter)
}
DebugLogger.Printf("{%s} REQ: %v", sub.Relay.URL, message)
DebugLogger.Printf("{%s} sending %v", sub.Relay.URL, message)
err := sub.conn.WriteJSON(message)
if err != nil {

View File

@@ -9,7 +9,7 @@ import (
// test if we can connect to wss://relay.damus.io and fetch a couple of random events
func TestSubscribe(t *testing.T) {
rl := mustRelayConnect("wss://relay.damus.io")
defer rl.Close("")
defer rl.Close()
sub, err := rl.Subscribe(context.Background(), Filters{{Kinds: []int{1}, Limit: 2}})
if err != nil {