From c237d1dd87d355b00d403ead77e71edaa7386f88 Mon Sep 17 00:00:00 2001
From: Indy Griffiths <indy@silverstripe.com>
Date: Tue, 3 Jul 2018 08:59:47 +1200
Subject: [PATCH] Disable Markdown for Slack messages and increase timeout

---
 mysite/code/Jobs/CheckSSLCertificates.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysite/code/Jobs/CheckSSLCertificates.php b/mysite/code/Jobs/CheckSSLCertificates.php
index 179dfb9..90f1bf2 100644
--- a/mysite/code/Jobs/CheckSSLCertificates.php
+++ b/mysite/code/Jobs/CheckSSLCertificates.php
@@ -178,7 +178,7 @@ protected function notifyNewCertificate($site, $cert)
                     'short' => true,
                 ],
             ],
-        ])->send('A new certificate has been detected for '.$site->Domain);
+        ])->disableMarkdown()->send('A new certificate has been detected for '.$site->Domain);
     }
 
     /**
@@ -207,7 +207,7 @@ protected function notifyFailure($site, $error)
         $client->attach([
             'color' => 'danger',
             'title' => $error,
-        ])->send('The certificate check for '.$site->Domain.' is failing. HTTPS requests to this domain may be failing for end-users.');
+        ])->disableMarkdown()->send('The certificate check for '.$site->Domain.' is failing. HTTPS requests to this domain may be failing for end-users.');
     }
 
     /**
@@ -236,7 +236,7 @@ protected function notifyCommonNameMismatch($site, $error)
         $client->attach([
             'color' => 'danger',
             'title' => $error,
-        ])->send('A common name mismatch has been detected for domain '.$site->Domain.'. HTTPS requests to this domain may be failing for end-users.');
+        ])->disableMarkdown()->send('A common name mismatch has been detected for domain '.$site->Domain.'. HTTPS requests to this domain may be failing for end-users.');
     }
 
     /**
@@ -268,7 +268,7 @@ private function getStream($domain)
             $socketErrors[] = str_replace('stream_socket_client(): ', '', $errstr);
         }, E_WARNING);
 
-        $read = stream_socket_client('ssl://'.$domain.':443', $errno, $errstr, 15, STREAM_CLIENT_CONNECT, $streamOptions);
+        $read = stream_socket_client('ssl://'.$domain.':443', $errno, $errstr, 30, STREAM_CLIENT_CONNECT, $streamOptions);
         restore_error_handler();
 
         if (!empty($socketErrors)) {