DustyP 9 months ago
parent 58e715f59e
commit aa9f35f0e5

@ -101,7 +101,7 @@ func (s *Server) routes() {
s.router.Use(func(next http.Handler) http.Handler { s.router.Use(func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
requestID := middleware.GetReqID(r.Context()) requestID := middleware.GetReqID(r.Context())
s.logger.Info("Request started", s.logger.Debug("Request started",
"method", r.Method, "method", r.Method,
"path", r.URL.Path, "path", r.URL.Path,
"requestID", requestID, "requestID", requestID,
@ -110,7 +110,7 @@ func (s *Server) routes() {
start := time.Now() start := time.Now()
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
s.logger.Info("Request completed", s.logger.Debug("Request completed",
"method", r.Method, "method", r.Method,
"path", r.URL.Path, "path", r.URL.Path,
"requestID", requestID, "requestID", requestID,
@ -450,7 +450,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) {
heatResult.Lane4Time = event.Result.Time heatResult.Lane4Time = event.Result.Time
heatResult.Lane4Position = event.Result.FinishPlace heatResult.Lane4Position = event.Result.FinishPlace
} }
s.sendRaceEventToAllClients(fmt.Sprintf("event: lane-%d-time\ndata: %.4f\n\n", event.Result.Lane, event.Result.Time)) s.sendRaceEventToAllClients(fmt.Sprintf("event: lane-%d-time\ndata: %.3f\n\n", event.Result.Lane, event.Result.Time))
s.sendRaceEventToAllClients(fmt.Sprintf("event: lane-%d-position\ndata: %d\n\n", event.Result.Lane, event.Result.FinishPlace)) s.sendRaceEventToAllClients(fmt.Sprintf("event: lane-%d-position\ndata: %d\n\n", event.Result.Lane, event.Result.FinishPlace))
case derby.EventRaceComplete: case derby.EventRaceComplete:
@ -604,7 +604,7 @@ func (s *Server) handleEvents() http.HandlerFunc {
requestID = fmt.Sprintf("req-%d", time.Now().UnixNano()) requestID = fmt.Sprintf("req-%d", time.Now().UnixNano())
} }
s.logger.Info("SSE connection request received", s.logger.Debug("SSE connection request received",
"requestID", requestID, "requestID", requestID,
"remoteAddr", r.RemoteAddr, "remoteAddr", r.RemoteAddr,
"userAgent", r.UserAgent()) "userAgent", r.UserAgent())
@ -634,7 +634,7 @@ func (s *Server) handleEvents() http.HandlerFunc {
clientCount := len(s.clients) clientCount := len(s.clients)
s.clientsMux.Unlock() s.clientsMux.Unlock()
s.logger.Info("New client connected", s.logger.Debug("New client connected",
"requestID", requestID, "requestID", requestID,
"clientIP", r.RemoteAddr, "clientIP", r.RemoteAddr,
"totalClients", clientCount) "totalClients", clientCount)
@ -655,7 +655,7 @@ func (s *Server) handleEvents() http.HandlerFunc {
s.clientsMux.Unlock() s.clientsMux.Unlock()
close(clientChan) close(clientChan)
s.logger.Info("Client disconnected", s.logger.Debug("Client disconnected",
"requestID", requestID, "requestID", requestID,
"clientIP", r.RemoteAddr, "clientIP", r.RemoteAddr,
"remainingClients", remainingClients) "remainingClients", remainingClients)
@ -695,7 +695,7 @@ func (s *Server) handleEvents() http.HandlerFunc {
} }
case <-r.Context().Done(): case <-r.Context().Done():
s.logger.Info("Client context done", s.logger.Debug("Client context done",
"requestID", requestID, "requestID", requestID,
"error", r.Context().Err()) "error", r.Context().Err())
return return
@ -762,7 +762,7 @@ func (s *Server) handleStatus() http.HandlerFunc {
// handleAdminEvents handles SSE events // handleAdminEvents handles SSE events
func (s *Server) handleAdminEvents() http.HandlerFunc { func (s *Server) handleAdminEvents() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
s.logger.Info("Admin events SSE connection established") s.logger.Debug("Admin events SSE connection established")
// Set headers for SSE // Set headers for SSE
w.Header().Set("Content-Type", "text/event-stream") w.Header().Set("Content-Type", "text/event-stream")
w.Header().Set("Cache-Control", "no-cache") w.Header().Set("Cache-Control", "no-cache")
@ -776,19 +776,19 @@ func (s *Server) handleAdminEvents() http.HandlerFunc {
http.Error(w, "Streaming unsupported!", http.StatusInternalServerError) http.Error(w, "Streaming unsupported!", http.StatusInternalServerError)
return return
} }
s.logger.Info("Admin events SSE headers flushed") s.logger.Debug("Admin events SSE headers flushed")
// Create a channel for this client // Create a channel for this client
clientChan := make(chan string, 10) clientChan := make(chan string, 10)
s.logger.Info("Admin events SSE client channel created") s.logger.Debug("Admin events SSE client channel created")
// Add client to map with mutex protection // Add client to map with mutex protection
s.adminclientsMux.Lock() s.adminclientsMux.Lock()
s.adminclients[clientChan] = true s.adminclients[clientChan] = true
clientCount := len(s.adminclients) clientCount := len(s.adminclients)
s.adminclientsMux.Unlock() s.adminclientsMux.Unlock()
s.logger.Info("Admin events SSE client added to map") s.logger.Debug("Admin events SSE client added to map")
s.logger.Info("New client connected", s.logger.Debug("New client connected",
"clientIP", r.RemoteAddr, "clientIP", r.RemoteAddr,
"totalClients", clientCount) "totalClients", clientCount)
@ -800,7 +800,7 @@ func (s *Server) handleAdminEvents() http.HandlerFunc {
s.adminclientsMux.Unlock() s.adminclientsMux.Unlock()
close(clientChan) close(clientChan)
s.logger.Info("Client disconnected", s.logger.Debug("Client disconnected",
"clientIP", r.RemoteAddr, "clientIP", r.RemoteAddr,
"remainingClients", remainingClients) "remainingClients", remainingClients)
}() }()

@ -104,10 +104,10 @@ templ ResultsDisplay(results []models.HeatResult) {
for _, result := range results { for _, result := range results {
<tr class={ "table-primary" }> <tr class={ "table-primary" }>
<td>{ strconv.Itoa(result.HeatNumber) }</td> <td>{ strconv.Itoa(result.HeatNumber) }</td>
<td>{ fmt.Sprintf("%.4f", result.Lane1Time) } ({ strconv.Itoa(result.Lane1Position) })</td> <td>{ fmt.Sprintf("%.3f", result.Lane1Time) } ({ strconv.Itoa(result.Lane1Position) })</td>
<td>{ fmt.Sprintf("%.4f", result.Lane2Time) } ({ strconv.Itoa(result.Lane2Position) })</td> <td>{ fmt.Sprintf("%.3f", result.Lane2Time) } ({ strconv.Itoa(result.Lane2Position) })</td>
<td>{ fmt.Sprintf("%.4f", result.Lane3Time) } ({ strconv.Itoa(result.Lane3Position) })</td> <td>{ fmt.Sprintf("%.3f", result.Lane3Time) } ({ strconv.Itoa(result.Lane3Position) })</td>
<td>{ fmt.Sprintf("%.4f", result.Lane4Time) } ({ strconv.Itoa(result.Lane4Position) })</td> <td>{ fmt.Sprintf("%.3f", result.Lane4Time) } ({ strconv.Itoa(result.Lane4Position) })</td>
</tr> </tr>
} }
</tbody> </tbody>

@ -240,7 +240,7 @@ func ResultsDisplay(results []models.HeatResult) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var11 string var templ_7745c5c3_Var11 string
templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.4f", result.Lane1Time)) templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", result.Lane1Time))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 107, Col: 75} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 107, Col: 75}
} }
@ -266,7 +266,7 @@ func ResultsDisplay(results []models.HeatResult) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var13 string var templ_7745c5c3_Var13 string
templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.4f", result.Lane2Time)) templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", result.Lane2Time))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 108, Col: 75} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 108, Col: 75}
} }
@ -292,7 +292,7 @@ func ResultsDisplay(results []models.HeatResult) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var15 string var templ_7745c5c3_Var15 string
templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.4f", result.Lane3Time)) templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", result.Lane3Time))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 109, Col: 75} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 109, Col: 75}
} }
@ -318,7 +318,7 @@ func ResultsDisplay(results []models.HeatResult) templ.Component {
return templ_7745c5c3_Err return templ_7745c5c3_Err
} }
var templ_7745c5c3_Var17 string var templ_7745c5c3_Var17 string
templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.4f", result.Lane4Time)) templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%.3f", result.Lane4Time))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 110, Col: 75} return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/race_manage.templ`, Line: 110, Col: 75}
} }

Loading…
Cancel
Save