diff --git a/internal/daemon/adminAgents.go b/internal/daemon/adminAgents.go index 206e4d3..e972d66 100644 --- a/internal/daemon/adminAgents.go +++ b/internal/daemon/adminAgents.go @@ -384,10 +384,8 @@ func (d *daemon) reconnectAgent(c *gin.Context) { d.agentPool.addAgent(agentForPool) d.eventpool.M.RLock() - log.Debug().Msg("Read lock on eventpool, adminAgents.go: 386") for _, event := range d.eventpool.Events { event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, adminAgents.go: 389") for _, lab := range event.Labs { if lab.ParentAgent.Name == agentForPool.Name { @@ -395,10 +393,8 @@ func (d *daemon) reconnectAgent(c *gin.Context) { } } event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, adminAgents.go: 397") } d.eventpool.M.RUnlock() - log.Debug().Msg("Read unlock on eventpool, adminAgents.go: 400") c.JSON(http.StatusOK, APIResponse{Status: "OK"}) return diff --git a/internal/daemon/adminEvents.go b/internal/daemon/adminEvents.go index 239c304..6680551 100644 --- a/internal/daemon/adminEvents.go +++ b/internal/daemon/adminEvents.go @@ -339,12 +339,10 @@ func (d *daemon) getEvents(c *gin.Context) { event, err := d.eventpool.GetEvent(dbEvent.Tag) if err == nil { event.M.RLock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read lock on event, adminEvents.go: 341") for _, lab := range event.Labs { labs = append(labs, lab) } event.M.RUnlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read unlock on event, adminEvents.go: 346") } } @@ -395,12 +393,10 @@ func (d *daemon) getEvents(c *gin.Context) { event, err := d.eventpool.GetEvent(dbEvent.Tag) if err == nil { event.M.RLock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read lock on event, adminEvents.go: 397") for _, lab := range event.Labs { labs = append(labs, lab) } event.M.RUnlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read unlock on event, adminEvents.go: 402") } } diff --git a/internal/daemon/agentpool.go b/internal/daemon/agentpool.go index 7d8dbe8..05dade9 100644 --- a/internal/daemon/agentpool.go +++ b/internal/daemon/agentpool.go @@ -114,10 +114,8 @@ func (ap *AgentPool) connectToMonitoringStream(routineCtx context.Context, a *Ag } event.UnassignedVpnLabs <- agentLab event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, agentpool.go: 116") event.Labs[l.Tag] = agentLab event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, agentpool.go: 119") saveState(eventPool, statePath) continue } @@ -133,10 +131,8 @@ func (ap *AgentPool) connectToMonitoringStream(routineCtx context.Context, a *Ag } event.UnassignedBrowserLabs <- agentLab event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, agentpool.go: 135") event.Labs[l.Tag] = agentLab event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, agentpool.go: 138") saveState(eventPool, statePath) continue } @@ -733,10 +729,8 @@ func (d *daemon) agentReconnectionRoutine(ticker *time.Ticker) { d.agentPool.addAgent(agentForPool) d.eventpool.M.RLock() - log.Debug().Msg("Read Lock on eventpool, agentpool.go: 734") for _, event := range d.eventpool.Events { event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, agentpool.go: 737") for _, lab := range event.Labs { if lab.ParentAgent.Name == agentForPool.Name { @@ -744,10 +738,8 @@ func (d *daemon) agentReconnectionRoutine(ticker *time.Ticker) { } } event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, agentpool.go: 745") } d.eventpool.M.RUnlock() - log.Debug().Msg("Read Unlock on eventpool, agentpool.go: 748") } } } diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index 33b02fe..970d192 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -367,10 +367,8 @@ func (d *daemon) labExpiryRoutine() { var wg sync.WaitGroup anyLabsClosed := false event.M.RLock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read Lock on event, daemon.go: 370") for _, team := range event.Teams { team.M.RLock() - log.Debug().Str("team", team.Username).Msg("Read Lock on team, daemon.go: 373") if team.Lab != nil { if time.Now().After(team.Lab.ExpiresAtTime) { if team.Lab.Conn != nil { @@ -380,15 +378,11 @@ func (d *daemon) labExpiryRoutine() { defer wg.Done() defer func() { event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, daemon.go: 383") delete(event.Labs, team.Lab.LabInfo.Tag) event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, daemon.go: 386") team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, daemon.go: 388") team.Lab = nil team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, daemon.go: 391") saveState(d.eventpool, d.conf.StatePath) sendCommandToTeam(team, updateTeam) }() @@ -405,10 +399,8 @@ func (d *daemon) labExpiryRoutine() { } } team.M.RUnlock() - log.Debug().Str("team", team.Username).Msg("Read unlock on team, daemon.go: 408") } event.M.RUnlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Read unlock on event, daemon.go: 411") wg.Wait() if anyLabsClosed { broadCastCommandToEventTeams(event, updateEventInfo) diff --git a/internal/daemon/eventExercises.go b/internal/daemon/eventExercises.go index d5709a2..3801d82 100644 --- a/internal/daemon/eventExercises.go +++ b/internal/daemon/eventExercises.go @@ -363,12 +363,10 @@ func (d *daemon) startExerciseInLab(c *gin.Context) { return } team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventExercises.go: 365") team.Status = RunningExerciseCommand defer func(team *Team) { team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventExercises.go: 370") sendCommandToTeam(team, updateTeam) }(team) sendCommandToTeam(team, updateTeam) @@ -505,12 +503,10 @@ func (d *daemon) stopExercise(c *gin.Context) { return } team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventExercises.go: 507") team.Status = RunningExerciseCommand defer func(team *Team) { team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventExercises.go: 512") sendCommandToTeam(team, updateTeam) }(team) sendCommandToTeam(team, updateTeam) @@ -565,12 +561,10 @@ func (d *daemon) resetExercise(c *gin.Context) { return } team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventExercises.go: 567") team.Status = RunningExerciseCommand defer func(team *Team) { team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventExercises.go: 572") sendCommandToTeam(team, updateTeam) }(team) sendCommandToTeam(team, updateTeam) diff --git a/internal/daemon/eventLabs.go b/internal/daemon/eventLabs.go index a05e339..b2de075 100644 --- a/internal/daemon/eventLabs.go +++ b/internal/daemon/eventLabs.go @@ -194,15 +194,11 @@ func (d *daemon) closeLab(c *gin.Context) { go func(team *Team, event *Event) { defer func() { event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, eventLabs.go: 195") delete(event.Labs, team.Lab.LabInfo.Tag) event.M.Unlock() - log.Debug().Str("eclearventTag", event.Config.Tag).Msg("Unlock on event, eventLabs.go: 198") team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventLabs.go: 200") team.Lab = nil team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventLabs.go: 203") saveState(d.eventpool, d.conf.StatePath) sendCommandToTeam(team, updateTeam) }() @@ -233,10 +229,8 @@ func (d *daemon) cancelLabConfigurationRequest(c *gin.Context) { } team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventLabs.go: 234") defer func(team *Team) { team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventLabs.go: 237") }(team) if team.Status == InQueue { @@ -404,12 +398,10 @@ func (d *daemon) resetVm(c *gin.Context) { } team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventLabs.go: 408") team.Status = RunningVmCommand defer func(team *Team) { team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventLabs.go: 413") sendCommandToTeam(team, updateTeam) }(team) sendCommandToTeam(team, updateTeam) diff --git a/internal/daemon/eventWebsocket.go b/internal/daemon/eventWebsocket.go index d119086..8a00a9c 100644 --- a/internal/daemon/eventWebsocket.go +++ b/internal/daemon/eventWebsocket.go @@ -64,21 +64,17 @@ func (d *daemon) eventWebsocket(c *gin.Context) { wsId := uuid.New().String() team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventWebsocket.go: 66") if team.ActiveWebsocketConnections == nil { team.ActiveWebsocketConnections = make(map[string]*websocket.Conn) } team.ActiveWebsocketConnections[wsId] = ws team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventWebsocket.go: 72") defer func(ws *websocket.Conn, team *Team, wsId string) { log.Debug().Msg("closing connection") team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventWebsocket.go: 77") delete(team.ActiveWebsocketConnections, wsId) team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventWebsocket.go: 81") ws.Close() }(ws, team, wsId) diff --git a/internal/daemon/eventpool.go b/internal/daemon/eventpool.go index b6cb321..7b0bd44 100644 --- a/internal/daemon/eventpool.go +++ b/internal/daemon/eventpool.go @@ -164,10 +164,8 @@ func (event *Event) startQueueHandlers(eventPool *EventPool, statePath string, l } log.Info().Msg("No more teams waiting for labs closing abunadant lab") event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, eventpool.go: 166") delete(event.Labs, lab.LabInfo.Tag) event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, eventpool.go: 169") saveState(eventPool, statePath) if err := lab.close(); err != nil { log.Error().Err(err).Msg("error closing lab no longer needed") @@ -180,13 +178,11 @@ func (event *Event) startQueueHandlers(eventPool *EventPool, statePath string, l team := e.Value.(*Team) team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventpool.go: 182") lab.IsAssigned = true lab.ExpiresAtTime = time.Now().Add(labExpiry * time.Minute) team.Lab = lab team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventpool.go: 188") sendCommandToTeam(team, updateTeam) saveState(eventPool, statePath) @@ -214,10 +210,8 @@ func (event *Event) startQueueHandlers(eventPool *EventPool, statePath string, l } log.Info().Msg("No more teams waiting for labs closing abunadant lab") event.M.Lock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Lock on event, eventpool.go: 216") delete(event.Labs, lab.LabInfo.Tag) event.M.Unlock() - log.Debug().Str("eventTag", event.Config.Tag).Msg("Unlock on event, eventpool.go: 219") saveState(eventPool, statePath) if err := lab.close(); err != nil { log.Error().Err(err).Msg("error closing lab no longer needed") @@ -231,13 +225,11 @@ func (event *Event) startQueueHandlers(eventPool *EventPool, statePath string, l team := e.Value.(*Team) team.M.Lock() - log.Debug().Str("team", team.Username).Msg("Lock on team, eventpool.go: 233") lab.IsAssigned = true lab.ExpiresAtTime = time.Now().Add(labExpiry * time.Minute) team.Lab = lab team.Status = Idle team.M.Unlock() - log.Debug().Str("team", team.Username).Msg("Unlock on team, eventpool.go: 239") sendCommandToTeam(team, updateTeam) saveState(eventPool, statePath)