fix writing cron files

sni · Jan 18, 2025 · 7d28b83 · 7d28b83
1 parent 3eb3431
commit 7d28b83
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/lib/Thruk/Utils.pm b/lib/Thruk/Utils.pm
@@ -2171,16 +2171,30 @@ sub update_cron_file {
     my @orig_cron;
     my $thruk_started = 0;
     if(-e $c->config->{'cron_file'}) {
-        open(my $fh, '<', $c->config->{'cron_file'}) or die('cannot read '.$c->config->{'cron_file'}.': '.$!);
+        my @lines = Thruk::Utils::IO::read_as_list($c->config->{'cron_file'});
         my $lastsection;
-        while(my $line = <$fh>) {
+        for(my $x = 0; $x < scalar @lines; $x++) {
+            my $line = $lines[$x];
             chomp($line);
-            $thruk_started = 1 if $line =~ m/^\#\ THIS\ PART\ IS\ WRITTEN\ BY\ THRUK/mx;
-            unless($thruk_started) {
+            if($line =~ m/^\#(\Q THIS PART IS WRITTEN BY THRUK\E|\Q THIS PART IS AUTO GENERATED BY THRUK\E)/mx) {
+                $thruk_started = 1;
+                # remove ruler comment right before the marker
+                my $prev = pop @orig_cron;
+                if($prev && $prev !~ m/^\#+$/mx) {
+                    push @orig_cron, $prev;
+                }
+            }
+            if(!$thruk_started) {
                 push @orig_cron, $line;
                 next;
             }
-            $thruk_started = 0 if $line =~ m/^\#\ END\ OF\ THRUK/mx;
+            if($line =~ m/^\Q# END OF THRUK/mx) {
+                $thruk_started = 0;
+                # remove ruler comment right after the marker
+                if(scalar @lines > $x+1 && $lines[$x+1] =~ m/^\#+$/mx) {
+                    $x++;
+                }
+            }
 
             if($line =~ m/^\#\ ([\w\s]+)$/mx) {
                 $lastsection = $1;
@@ -2192,7 +2206,6 @@ sub update_cron_file {
             $sections->{$lastsection} = [] unless defined $sections->{$lastsection};
             push @{$sections->{$lastsection}}, $line;
         }
-        CORE::close($fh) or die("cannot close file ".$c->config->{'cron_file'}.": ".$!);
     }
 
     # write out new file

diff --git a/t/100-cli-thruk.t b/t/100-cli-thruk.t
@@ -118,7 +118,7 @@ TestUtils::test_command({
     like => ['/^OK - recurring downtime saved$/'],
 });
 TestUtils::test_command({
-    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS WRITTEN BY THRUK" | wc -l',
+    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS AUTO GENERATED BY THRUK" | wc -l',
     like => ['/^\s*1$/' ],
 });
 
@@ -128,7 +128,7 @@ TestUtils::test_command({
     like => ['/OK - updated crontab$/'],
 });
 TestUtils::test_command({
-    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS WRITTEN BY THRUK" | wc -l',
+    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS AUTO GENERATED BY THRUK" | wc -l',
     like => ['/^\s*1$/' ],
 });
 
@@ -154,7 +154,7 @@ TestUtils::test_command({
     like => ['/^cron entries removed/'],
 });
 TestUtils::test_command({
-    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS WRITTEN BY THRUK" | wc -l',
+    cmd  => '/usr/bin/crontab -l '.$cronuser.' | grep "THIS PART IS AUTO GENERATED BY THRUK" | wc -l',
     like => ['/^\s*0$/' ],
 });