From 2832e2389317e872ec914692477a0059560390b0 Mon Sep 17 00:00:00 2001
From: Chris Alfano <chris@jarv.us>
Date: Tue, 21 Jul 2020 03:54:34 +0000
Subject: [PATCH] refactor: convert heartbeat event handlers to console
 commands

---
 console-commands/gk/flush-metrics.php              |  9 +++++++++
 console-commands/gk/ping-endpoints.php             |  9 +++++++++
 .../Gatekeeper/heartbeat/40_flush-metrics.php      |  7 -------
 .../Gatekeeper/heartbeat/50_ping-endpoints.php     |  3 ---
 php-classes/Gatekeeper/Endpoints/Pinger.php        | 14 +++++++++-----
 5 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 console-commands/gk/flush-metrics.php
 create mode 100644 console-commands/gk/ping-endpoints.php
 delete mode 100644 event-handlers/Gatekeeper/heartbeat/40_flush-metrics.php
 delete mode 100644 event-handlers/Gatekeeper/heartbeat/50_ping-endpoints.php

diff --git a/console-commands/gk/flush-metrics.php b/console-commands/gk/flush-metrics.php
new file mode 100644
index 0000000..76a36fd
--- /dev/null
+++ b/console-commands/gk/flush-metrics.php
@@ -0,0 +1,9 @@
+<?php
+
+$logger = $_COMMAND['LOGGER'];
+
+$logger->info('Flushing metrics');
+
+$flushed = Gatekeeper\Metrics\Metrics::flushMetricSamples();
+
+$logger->info("{$flushed} metrics flushed");
diff --git a/console-commands/gk/ping-endpoints.php b/console-commands/gk/ping-endpoints.php
new file mode 100644
index 0000000..0d3ea18
--- /dev/null
+++ b/console-commands/gk/ping-endpoints.php
@@ -0,0 +1,9 @@
+<?php
+
+$logger = $_COMMAND['LOGGER'];
+
+$logger->info('Pinging endpoints...');
+
+$pinged = Gatekeeper\Endpoints\Pinger::pingOverdueEndpoints($logger);
+
+$logger->info("{$pinged} endpoints pinged");
diff --git a/event-handlers/Gatekeeper/heartbeat/40_flush-metrics.php b/event-handlers/Gatekeeper/heartbeat/40_flush-metrics.php
deleted file mode 100644
index 6a3f9bf..0000000
--- a/event-handlers/Gatekeeper/heartbeat/40_flush-metrics.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-printf('Flushing metrics...') && flush();
-
-$flushed = Gatekeeper\Metrics\Metrics::flushMetricSamples();
-
-printf('%u metrics flushed' . PHP_EOL, $flushed);
\ No newline at end of file
diff --git a/event-handlers/Gatekeeper/heartbeat/50_ping-endpoints.php b/event-handlers/Gatekeeper/heartbeat/50_ping-endpoints.php
deleted file mode 100644
index 56ad100..0000000
--- a/event-handlers/Gatekeeper/heartbeat/50_ping-endpoints.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-Gatekeeper\Endpoints\Pinger::pingOverdueEndpoints(true);
diff --git a/php-classes/Gatekeeper/Endpoints/Pinger.php b/php-classes/Gatekeeper/Endpoints/Pinger.php
index a7a76fa..1630414 100644
--- a/php-classes/Gatekeeper/Endpoints/Pinger.php
+++ b/php-classes/Gatekeeper/Endpoints/Pinger.php
@@ -6,6 +6,8 @@
 use Cache;
 use HttpProxy;
 
+use Psr\Log\LoggerInterface;
+
 use Gatekeeper\ApiRequestHandler;
 use Gatekeeper\Alerts\TestFailed;
 use Gatekeeper\Transactions\PingTransaction;
@@ -13,7 +15,7 @@
 
 class Pinger
 {
-    public static function pingOverdueEndpoints($verbose = false)
+    public static function pingOverdueEndpoints(LoggerInterface $logger = null)
     {
         $endpoints = Endpoint::getAllByWhere('PingFrequency IS NOT NULL');
 
@@ -24,14 +26,16 @@ public static function pingOverdueEndpoints($verbose = false)
                 $lastPing === false
                 || $Endpoint->PingFrequency*60 < time()-$lastPing['time']
             ) {
-                static::pingEndpoint($Endpoint, $verbose);
+                static::pingEndpoint($Endpoint, $logger);
             }
         }
+
+        return count($endpoints);
     }
 
-    public static function pingEndpoint(Endpoint $Endpoint, $verbose = false)
+    public static function pingEndpoint(Endpoint $Endpoint, LoggerInterface $logger = null)
     {
-        $verbose && printf('Testing endpoint: /%s...', $Endpoint->Path) && flush();
+        $logger && $logger->info("/{$Endpoint->Path} is being pinged");
 
 
         // execute and capture request
@@ -108,7 +112,7 @@ public static function pingEndpoint(Endpoint $Endpoint, $verbose = false)
         }
 
 
-        $verbose && printf("%s\n", $testPassed ? 'passed' : 'failed') && flush();
+        $logger && $logger->info("/{$Endpoint->Path} ". ($testPassed ? 'passed' : 'failed'));
 
 
         // cache result and timestamp