From a94c7b1a4be81fa4c56dd5d225483620facd9fad Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Tue, 11 Sep 2007 23:45:42 +0000
Subject: [PATCH] report module loading errors to apache log during preload

---
 docs/changelog/7.x.x.txt | 1 +
 sbin/preload.perl        | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 58e6ca48c..66220dcf6 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -38,6 +38,7 @@
  - fix: Fixed SyncProfileToLDAP workflow activity to properly sync if RDN does not match DN
  - fix: SQL Report download link doesn't include form parameters
  - fix: Errors generated in webgui.log when viewing last thread
+ - Report errors on loading modules to Apache log during preload
 
 7.4.5
  - fix: Apostrophy incorrectly escaped as double quote in some places
diff --git a/sbin/preload.perl b/sbin/preload.perl
index e7bd9a00c..4eb6348fb 100644
--- a/sbin/preload.perl
+++ b/sbin/preload.perl
@@ -68,8 +68,10 @@ foreach my $lib (@{$customLibs}) {
 File::Find::find(\&getWebGUIModules, @folders);
 foreach my $package (@modules) {
 	next if (WebGUI::Utility::isIn($package,@excludes));
-	my $use = "use ".$package." ()";
-	eval($use);
+	(my $file = "$package.pm") =~ s{::|'}{/}g;
+    if (!eval { require $file; 1 }) {
+        warn "Error loading $package! - $@";
+    }
 }
 
 use Apache2::ServerUtil ();