From 4114af1fa1e592b0ba2c38799e1801ce7460fbf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Sat, 29 Nov 2008 07:53:45 +0000
Subject: [PATCH] Error handling in sanity cron hook
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1031 44740490-163a-0410-bde0-09ae8108e29a
---
modules/sanitycheck/hooks/hook_cron.php | 44 +++++++++++++++----------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/modules/sanitycheck/hooks/hook_cron.php b/modules/sanitycheck/hooks/hook_cron.php
index bcd5d93c9..74c6f221b 100644
--- a/modules/sanitycheck/hooks/hook_cron.php
+++ b/modules/sanitycheck/hooks/hook_cron.php
@@ -9,26 +9,34 @@ function sanitycheck_hook_cron(&$croninfo) {
assert('array_key_exists("summary", $croninfo)');
assert('array_key_exists("tag", $croninfo)');
- $config = SimpleSAML_Configuration::getInstance();
- $sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
-
- if (is_null($sconfig->getValue('cron_tag', NULL))) return;
- if ($sconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
-
-
- $info = array();
- $errors = array();
- $hookinfo = array(
- 'info' => &$info,
- 'errors' => &$errors,
- );
-
- SimpleSAML_Module::callHooks('sanitycheck', $hookinfo);
+ SimpleSAML_Logger::info('cron [sanitycheck]: Running cron in cron tag [' . $croninfo['tag'] . '] ');
+
+ try {
- if (count($errors) > 0) {
- foreach ($errors AS $err) {
- $croninfo['summary'][] = 'Sanitycheck error: ' . $err;
+ $config = SimpleSAML_Configuration::getInstance();
+ $sconfig = $config->copyFromBase('sconfig', 'config-sanitycheck.php');
+
+ if (is_null($sconfig->getValue('cron_tag', NULL))) return;
+ if ($sconfig->getValue('cron_tag', NULL) !== $croninfo['tag']) return;
+
+
+ $info = array();
+ $errors = array();
+ $hookinfo = array(
+ 'info' => &$info,
+ 'errors' => &$errors,
+ );
+
+ SimpleSAML_Module::callHooks('sanitycheck', $hookinfo);
+
+ if (count($errors) > 0) {
+ foreach ($errors AS $err) {
+ $croninfo['summary'][] = 'Sanitycheck error: ' . $err;
+ }
}
+
+ } catch (Exception $e) {
+ $croninfo['summary'][] = 'Error executing sanity check: ' . $e->getMessage();
}
}
--
GitLab