From eecfa36a19cc653dc45a009bc964f8dd7942374e Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 24 Nov 2022 23:25:39 +0000
Subject: [PATCH] Fix error_log() invocations and blog domain
---
lib/cron.php | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/cron.php b/lib/cron.php
index 7719294..2f0f5dd 100644
--- a/lib/cron.php
+++ b/lib/cron.php
@@ -35,15 +35,17 @@ function noblogs_run_cron_for_current_blog() {
if ($schedule) {
$result = wp_reschedule_event($timestamp, $schedule, $hook, $v['args'], true);
if (is_wp_error($result)) {
- error_log('cron reschedule event error for hook: %1$s, code: %2$s, message: %3$s, data: %4$s',
- $hook, $result->get_error_code(), $result->get_error_message(), wp_json_encode($v));
+ error_log(sprintf(
+ 'cron reschedule event error for hook: %1$s, code: %2$s, message: %3$s, data: %4$s',
+ $hook, $result->get_error_code(), $result->get_error_message(), wp_json_encode($v)));
do_action('cron_reschedule_event_error', $result, $hook, $v);
}
}
$result = wp_unschedule_event($timestamp, $hook, $v['args'], true);
if (is_wp_error($result)) {
- error_log('cron unschedule event error for hook: %1$s, code: %2$s, message: %3$s, data: %4$s',
- $hook, $result->get_error_code(), $result->get_error_message(), wp_json_encode($v));
+ error_log(sprintf(
+ 'cron unschedule event error for hook: %1$s, code: %2$s, message: %3$s, data: %4$s',
+ $hook, $result->get_error_code(), $result->get_error_message(), wp_json_encode($v)));
do_action('cron_unschedule_event_error', $result, $hook, $v);
}
do_action_ref_array($hook, $v['args']);
@@ -52,7 +54,8 @@ function noblogs_run_cron_for_current_blog() {
}
if ($has_unsafe_hooks) {
- $domain = get_option('domain');
+ $blog_details = get_blog_details(null, false);
+ $domain = $blog_details->domain;
echo " executing wp-cli for unsafe hooks ({$domain})";
system("wp cron event run --due-now --url={$domain}");
}
--
GitLab