From 9c08d78304dbb495f877b872fca00caa7c550eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Mon, 10 Sep 2018 21:42:18 +0300
Subject: [PATCH] Add missing error messages

If tee filter creation fails, it would not log an error message.
---
 server/core/filter.cc                   | 2 ++
 server/core/session.cc                  | 1 +
 server/modules/filter/tee/teesession.cc | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/server/core/filter.cc b/server/core/filter.cc
index 0fc53ca5f..88d38e9ba 100644
--- a/server/core/filter.cc
+++ b/server/core/filter.cc
@@ -420,6 +420,7 @@ filter_apply(MXS_FILTER_DEF *filter, MXS_SESSION *session, MXS_DOWNSTREAM *downs
 
     if ((me = (MXS_DOWNSTREAM *)MXS_CALLOC(1, sizeof(MXS_DOWNSTREAM))) == NULL)
     {
+        MXS_OOM();
         return NULL;
     }
     me->instance = filter->filter;
@@ -427,6 +428,7 @@ filter_apply(MXS_FILTER_DEF *filter, MXS_SESSION *session, MXS_DOWNSTREAM *downs
 
     if ((me->session = filter->obj->newSession(me->instance, session)) == NULL)
     {
+        MXS_ERROR("Failed to create filter session for '%s'", filter->name);
         MXS_FREE(me);
         return NULL;
     }
diff --git a/server/core/session.cc b/server/core/session.cc
index 9ea030cc2..4ae62812e 100644
--- a/server/core/session.cc
+++ b/server/core/session.cc
@@ -628,6 +628,7 @@ session_setup_filters(MXS_SESSION *session)
     if ((session->filters = (SESSION_FILTER*)MXS_CALLOC(service->n_filters,
                                                         sizeof(SESSION_FILTER))) == NULL)
     {
+        MXS_OOM();
         return 0;
     }
     session->n_filters = service->n_filters;
diff --git a/server/modules/filter/tee/teesession.cc b/server/modules/filter/tee/teesession.cc
index 5f83cce19..487baca9a 100644
--- a/server/modules/filter/tee/teesession.cc
+++ b/server/modules/filter/tee/teesession.cc
@@ -98,6 +98,7 @@ TeeSession* TeeSession::create(Tee* my_instance, MXS_SESSION* session)
         if ((match && (md_match = pcre2_match_data_create_from_pattern(match, NULL)) == NULL) ||
             (exclude && (md_exclude = pcre2_match_data_create_from_pattern(exclude, NULL)) == NULL))
         {
+            MXS_OOM();
             return NULL;
         }
 
@@ -105,6 +106,9 @@ TeeSession* TeeSession::create(Tee* my_instance, MXS_SESSION* session)
                                           (MySQLProtocol*)session->client_dcb->protocol,
                                           my_instance->get_service())) == NULL)
         {
+            MXS_ERROR("Failed to create local client connection to '%s'%s",
+                      my_instance->get_service()->name,
+                      my_instance->get_service()->ports ? "" : ": Service has no network listeners");
             return NULL;
         }
     }