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

refactor: Change order of events and logging in principal callbacks #32

Merged
merged 1 commit into from
Mar 4, 2024
Merged

refactor: Change order of events and logging in principal callbacks #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 28 additions & 17 deletions principal/callbacks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,22 @@ import (
// is in autonomous mode, this event will be discarded.
func (s *Server) newAppCallback(outbound *v1alpha1.Application) {
logCtx := log().WithFields(logrus.Fields{
"component": "NewAppCallback",
"namespace": outbound.Namespace,
"component": "EventCallback",
"queue": outbound.Namespace,
"event": "application_new",
"application_name": outbound.Name,
})

mode := s.agentMode(outbound.Namespace)
if mode != types.AgentModeManaged {
logCtx.Tracef("Discarding NewApp event for unmanaged agent")
// Return early if no interested agent is connected
if !s.queues.HasQueuePair(outbound.Namespace) {
logCtx.Debug("No agent is connected to this queue, discarding event")
return
}
if !s.queues.HasQueuePair(outbound.Namespace) {
logCtx.Tracef("no agent connected to namespace %s, discarding", outbound.Namespace)

// New app events are only relevant for managed agents
mode := s.agentMode(outbound.Namespace)
if mode != types.AgentModeManaged {
logCtx.Tracef("Discarding event for unmanaged agent")
return
}
q := s.queues.SendQ(outbound.Namespace)
Expand All @@ -39,21 +44,22 @@ func (s *Server) updateAppCallback(old *v1alpha1.Application, new *v1alpha1.Appl
s.watchLock.Lock()
defer s.watchLock.Unlock()
logCtx := log().WithFields(logrus.Fields{
"component": "UpdateAppCallback",
"application": old.Name,
"queue": old.Namespace,
"component": "EventCallback",
"queue": old.Namespace,
"event": "application_update",
"application_name": old.Name,
})
if s.appManager.IsChangeIgnored(new.QualifiedName(), new.ResourceVersion) {
logCtx.Debugf("I have seen this version %s already", new.ResourceVersion)
logCtx.WithField("resource_version", new.ResourceVersion).Debugf("Resource version has already been seen")
return
}
if !s.queues.HasQueuePair(old.Namespace) {
logCtx.Tracef("no agent connected to namespace %s, discarding", old.Namespace)
logCtx.Tracef("No agent is connected to this queue, discarding event")
return
}
q := s.queues.SendQ(old.Namespace)
if q == nil {
logCtx.Errorf("Help! queue pair for namespace %s disappeared!", old.Namespace)
logCtx.Error("Help! Queue pair has disappeared!")
return
}
ev := s.events.NewApplicationEvent(event.ApplicationSpecUpdated, new)
Expand All @@ -62,19 +68,24 @@ func (s *Server) updateAppCallback(old *v1alpha1.Application, new *v1alpha1.Appl
}

func (s *Server) deleteAppCallback(outbound *v1alpha1.Application) {
logCtx := log().WithField("component", "DeleteAppCallback")
logCtx := log().WithFields(logrus.Fields{
"component": "EventCallback",
"queue": outbound.Namespace,
"event": "application_delete",
"application_name": outbound.Name,
})
if !s.queues.HasQueuePair(outbound.Namespace) {
logCtx.Tracef("no agent connected to namespace %s, discarding", outbound.Namespace)
logCtx.Tracef("No agent is connected to this queue, discarding event")
return
}
mode := s.agentMode(outbound.Namespace)
if mode != types.AgentModeManaged {
logCtx.Tracef("Discarding DeleteApp event for unmanaged agent")
logCtx.Tracef("Discarding event for unmanaged agent")
return
}
q := s.queues.SendQ(outbound.Namespace)
if q == nil {
logCtx.Errorf("Help! queue pair for namespace %s disappeared!", outbound.Namespace)
logCtx.Error("Help! Queue pair has disappeared!")
return
}
ev := s.events.NewApplicationEvent(event.ApplicationDeleted, outbound)
Expand Down
Loading