From 8d65490894801fd3ded01dca6081ff137774e059 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 1 Mar 2012 16:21:27 +0000
Subject: [PATCH] Have xCATd more clearly report when registering a plugin
 fails, also be resiliant to the situation.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11723 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatd | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index 6543c6b00..23ce7fc60 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -582,7 +582,14 @@ sub scan_plugins {
         next;
     }
     no strict 'refs';
-    my $cmd_adds=${"xCAT_plugin::".$modname."::"}{handled_commands}->();
+    my $cmd_adds;
+    eval {
+       $cmd_adds=${"xCAT_plugin::".$modname."::"}{handled_commands}->();
+    };
+    if ($@) { 
+        xCAT::MsgUtils->message("S","Error registering module ".$_."  ...skipping");
+       next;
+    }
     foreach (keys %$cmd_adds) {
       my $value = $_;
       my @modulehandlerinfos;