From a5a032e7bebb4a725e3416e6708d20cdf9b7472e Mon Sep 17 00:00:00 2001 From: Dale Mellor Date: Thu, 7 Jul 2022 22:15:49 +0100 Subject: cron doesnʼt need the --log-format and --date-format options. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * src/cron.in: remove the options * src/mcron/scripts/cron.scm: no need for extra processing --- src/cron.in | 1 + src/mcron/scripts/cron.scm | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cron.in b/src/cron.in index fc4725e..b260a5e 100644 --- a/src/cron.in +++ b/src/cron.in @@ -27,6 +27,7 @@ (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))) (use-modules (mcron scripts cron) + (mcron utils) (ice-9 command-line-processor)) (process-command-line (command-line) diff --git a/src/mcron/scripts/cron.scm b/src/mcron/scripts/cron.scm index 0a3b8b2..2e36d87 100644 --- a/src/mcron/scripts/cron.scm +++ b/src/mcron/scripts/cron.scm @@ -153,12 +153,10 @@ option.\n") (with-output-to-file config-pid-file (λ () (display (getpid)) (newline))) - (parameterize ((%log-format (option-ref opts 'log-format (%log-format))) - (%date-format (option-ref opts 'date-format (%date-format)))) - ;; Forever execute the 'run-job-loop', and when it drops out (can - ;; only be because a message has come in on the socket) we - ;; process the socket request before restarting the loop again. - (let ((fdes-list (cron-file-descriptors))) - (while #t - (run-job-loop fdes-list) - (unless (null? fdes-list) (process-update-request fdes-list)))))) + ;; Forever execute the 'run-job-loop', and when it drops out (can + ;; only be because a message has come in on the socket) we + ;; process the socket request before restarting the loop again. + (let ((fdes-list (cron-file-descriptors))) + (while #t + (run-job-loop fdes-list) + (unless (null? fdes-list) (process-update-request fdes-list))))) -- cgit v1.2.3