From 85a080b76a49c76f9f29a52ccac8adbe00ba0750 Mon Sep 17 00:00:00 2001
From: James Adams <james@bluezen.co.uk>
Date: Tue, 8 Feb 2022 12:43:32 +0000
Subject: [PATCH] cdp-listend: Factor out calls to notification handlers

* Factor out calls to notification handlers to a new subroutine as much of the code is common.
* Log unknown notification types.
* Improve slightly ambigious log messages regarding timing.
---
 src/main/scripts/cdp-listend | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/scripts/cdp-listend b/src/main/scripts/cdp-listend
index 2b25d0c..792f2e8 100755
--- a/src/main/scripts/cdp-listend
+++ b/src/main/scripts/cdp-listend
@@ -192,25 +192,25 @@ while($ip1->recv($newmsg,1024)) {
     my $ntype = $1;
     my $time  = $2;
     logit('info',"Received UDP packet ($ntype|$time) from $r_host");
-    # time extraction!
-    if ($ntype eq"ccm") {
-        my $smear = int(rand($fetch_smear));
-        my $delay = $smear + $fetch_offset;
-        logit('info', "$fetch will be called in $delay seconds (offset=$fetch_offset, smear=$smear)");
-        sleep($delay);
-        logit('info', "Calling $fetch with unix time $time (after $delay seconds)");
-        system ("$fetch --profile-time=$time") == 0
-            or logit('err',"[ERROR] call of ccm-fetch ($fetch) failed: $!");
+    if ($ntype eq "ccm") {
+        my $delay = int(rand($fetch_smear)) + $fetch_offset;
+        call_handler($fetch, "--profile-time=$time", $delay);
     } elsif ($ntype eq "cdb") {
-        my $smear = int(rand($nch_smear));
-        logit('info', "$nch will be called in $smear seconds");
-        sleep($smear);
-        logit('info', "Calling $nch with unix time $time (after $smear seconds)");
-        system ("$nch") == 0
-            or logit('err',"[ERROR] call of cdbsync-nch ($nch) failed: $!");
+        my $delay = int(rand($nch_smear));
+        call_handler($nch, "", $delay);
+    } else {
+        logit('err', "[ERROR] Ignoring packet, unknown notification type");
     }
 }
 
+sub call_handler {
+    my ($handler, $handler_args, $delay) = @_;
+    logit('info', "$handler will be called in $delay seconds");
+    sleep($delay);
+    logit('info', "Calling $handler now");
+    system ("$handler $handler_args") == 0 or logit('err',"[ERROR] call of $handler failed: $!");
+}
+
 sub logit {
     my ($priority, $msg) = @_;
     return 0 unless ($priority =~ /info|err|debug/);