Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix kafka reader, change log format #53

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Fix kafka reader, change log format #53

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e47b7
Fix kafka reader, change log format
jeremy5189 Oct 12, 2023
dd0d2c7
Remove setOffset
jeremy5189 Oct 12, 2023
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
3 changes: 2 additions & 1 deletion internal/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ func updateExpiringDecisionLists(
log.Println("From baskerville", fromBaskerville)
}

purgeNginxAuthCacheForIp(ip)
// XXX We are not using nginx to banjax cache feature yet
// purgeNginxAuthCacheForIp(ip)
expires := now.Add(time.Duration(config.ExpiringDecisionTtlSeconds) * time.Second)
(*decisionLists).ExpiringDecisionLists[ip] = ExpiringDecision{newDecision, expires, fromBaskerville}
}
Expand Down
24 changes: 15 additions & 9 deletions internal/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ sample baskerville message:
}
*/
type commandMessage struct {
Name string
Value string
Host string `json:"host"`
Name string
Value string
Host string `json:"host"`
SessionId string `json:"session_id"`
Source string `json:"source"`
}

func getDialer(config *Config) *kafka.Dialer {
Expand Down Expand Up @@ -87,10 +89,11 @@ func RunKafkaReader(
// XXX this infinite loop is so we reconnect if we get dropped.
for {
r := kafka.NewReader(kafka.ReaderConfig{
Brokers: config.KafkaBrokers,
GroupID: uuid.New().String(),
Topic: config.KafkaCommandTopic,
Dialer: getDialer(config),
Brokers: config.KafkaBrokers,
GroupID: uuid.New().String(),
StartOffset: kafka.LastOffset,
Topic: config.KafkaCommandTopic,
Dialer: getDialer(config),
})
r.SetOffset(kafka.LastOffset)
defer r.Close()
Expand All @@ -109,15 +112,18 @@ func RunKafkaReader(
continue // XXX what to do here?
}

log.Printf("KAFKA: message at offset %d: %s = %s\n", m.Offset, string(m.Key), string(m.Value))
// log.Printf("KAFKA: message at offset %d: %s = %s\n", m.Offset, string(m.Key), string(m.Value))

command := commandMessage{}
err = json.Unmarshal(m.Value, &command)
if err != nil {
log.Println("KAFKA: json.Unmarshal() failed")
log.Printf("KAFKA: Unmarshal failed %d: %s = %s\n", m.Offset, string(m.Key), string(m.Value))
continue
}

log.Printf("KAFKA: message %s (%d/%d) = N: %s, V: %s, S: %s: Src: %s\n",
string(m.Key), m.Offset, m.Partition, command.Name, command.Value, command.SessionId, command.Source)

handleCommand(
config,
command,
Expand Down
Loading