Skip to content
Snippets Groups Projects
Commit b6d1ed89 authored by thijsheijden's avatar thijsheijden
Browse files

Updated panic defer function to send message to frontend

parent d46fc46d
No related branches found
No related tags found
1 merge request!4Added panic intercept method to RabbitMQ message handler
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
...@@ -25,13 +25,6 @@ HandleMessage gets called when a message is received ...@@ -25,13 +25,6 @@ HandleMessage gets called when a message is received
*/ */
func (s *Service) HandleMessage(msg *broker.Message) { func (s *Service) HandleMessage(msg *broker.Message) {
// Defer a panic intercepting function
defer func() {
if err := recover(); err != nil {
log.Printf("PANIC: %e", err.(error))
}
}()
// Grab the headers from the message // Grab the headers from the message
sessionID, clientID, queryID, err := getHeaders(&msg.Headers) sessionID, clientID, queryID, err := getHeaders(&msg.Headers)
if err != nil { if err != nil {
...@@ -40,6 +33,15 @@ func (s *Service) HandleMessage(msg *broker.Message) { ...@@ -40,6 +33,15 @@ func (s *Service) HandleMessage(msg *broker.Message) {
} }
s.publishStatus("Received", sessionID, queryID) s.publishStatus("Received", sessionID, queryID)
// Defer a panic intercepting function
defer func(sessionID, queryID *string) {
if err := recover(); err != nil {
log.Printf("PANIC: %e", err.(error))
s.publishStatus("Critical Error", sessionID, queryID)
}
}(sessionID, queryID)
// Unmarshall the incoming message into an IncomingJSONQuery object // Unmarshall the incoming message into an IncomingJSONQuery object
JSONQuery, err := query.UnmarshalJSON(&msg.Body) JSONQuery, err := query.UnmarshalJSON(&msg.Body)
if err != nil { if err != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment