From 53fcb004c9bc3688a8d08ff689c24bcab5c5ddb4 Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Tue, 30 Apr 2024 16:28:27 +0200
Subject: [PATCH] Change some message outputs.

---
 bouncer/src/Bouncer.php | 4 ++--
 bouncer/src/Target.php  | 4 ++--
 mysql-proxy/Dockerfile  | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bouncer/src/Bouncer.php b/bouncer/src/Bouncer.php
index 4cbcd82..d5fdcd8 100644
--- a/bouncer/src/Bouncer.php
+++ b/bouncer/src/Bouncer.php
@@ -400,7 +400,7 @@ class Bouncer
 
                 case 'BOUNCER_HOST_OVERRIDE':
                     $bouncerTarget->setHostOverride($envVal);
-                    $this->logger->warning('{label}: Host reported to container overridden and set to {host_override}.', ['emoji' => Emoji::hikingBoot() . ' ', 'label' => $bouncerTarget->getLabel(), 'host_override' => $bouncerTarget->getHostOverride()]);
+                    $this->logger->warning('{label}: Host reported to container overridden and set to {host_override}.', ['emoji' => Emoji::hikingBoot(), 'label' => $bouncerTarget->getLabel(), 'host_override' => $bouncerTarget->getHostOverride()]);
 
                     break;
 
@@ -781,7 +781,7 @@ class Bouncer
                 $this->logger->info('Created {label}', $context + ['emoji' => Emoji::pencil() . ' ']);
                 $this->logger->debug('  -> {config_dir}/{file}', $context + ['emoji' => Emoji::pencil() . ' ']);
                 $this->logger->debug('  -> {domain}', $context + ['emoji' => Emoji::pencil() . ' ']);
-                $this->logger->critical('{label} cert type is {cert_type}', $context + ['emoji' => Emoji::catFace() . ' ', 'cert_type' => $target->getTypeCertInUse()->name]);
+                $this->logger->critical('{label} cert type is {cert_type}', $context + ['emoji' => Emoji::catFace(), 'cert_type' => $target->getTypeCertInUse()->name]);
             }
         } else {
             $this->logger->info('More than {num_max} Nginx configs generated.. Too many to show them all!', ['emoji' => Emoji::pencil() . ' ', 'num_max' => $this->getMaximumNginxConfigCreationNotices()]);
diff --git a/bouncer/src/Target.php b/bouncer/src/Target.php
index f88477f..06373db 100644
--- a/bouncer/src/Target.php
+++ b/bouncer/src/Target.php
@@ -442,12 +442,12 @@ class Target
         // Is it a Hostname that resolves?
         $resolved = gethostbyname($this->getEndpointHostnameOrIp());
         if (filter_var($resolved, FILTER_VALIDATE_IP)) {
-            // $this->logger->debug(sprintf('%s isEndpointValid: %s is a hostname that resolves to a normal IP %s', Emoji::magnifyingGlassTiltedRight(), $this->getEndpointHostnameOrIp(), $resolved));
+            // $this->logger->critical(sprintf('%s isEndpointValid: %s is a hostname that resolves to a normal IP %s', Emoji::magnifyingGlassTiltedRight(), $this->getEndpointHostnameOrIp(), $resolved));
 
             return true;
         }
 
-        $this->logger->warning('isEndpointValid: {endpoint} is a hostname that does not resolve', ['emoji' => Emoji::magnifyingGlassTiltedRight(), 'endpoint' => $this->getEndpointHostnameOrIp()]);
+        $this->logger->critical('isEndpointValid: {endpoint} is a hostname that does not resolve', ['emoji' => Emoji::magnifyingGlassTiltedRight(), 'endpoint' => $this->getEndpointHostnameOrIp()]);
 
         return false;
     }
diff --git a/mysql-proxy/Dockerfile b/mysql-proxy/Dockerfile
index 2d8a461..17a350a 100755
--- a/mysql-proxy/Dockerfile
+++ b/mysql-proxy/Dockerfile
@@ -14,6 +14,7 @@ RUN adduser mysql && \
     apt-get -y install --no-install-recommends \
       wget \
       mysql-client \
+      socat \
     && \
     wget -q https://downloads.mysql.com/archives/get/p/21/file/$MYSQL_PROXY_TAR_NAME.tar.gz && \
     tar -xzvf $MYSQL_PROXY_TAR_NAME.tar.gz && \