Several fixes:

    - Broken modules on startup will not cause resmon to quit, but will be
      added to the failed modules list and have a status shown as BAD.
    - Broken modules on startup will no longer break the XML (because there is
      no config_as_hash to generate the configuration from)
    - Reloading modules that were initially broken (either from startup or
      from adding them to the config file and reloading) now works correctly.


git-svn-id: https://labs.omniti.com/resmon/trunk@108 8c0face9-b7db-6ec6-c4b3-d5f7145c7d55

lib/Resmon/Config.pm

@@ -7,6 +7,7 @@ sub new {
   my $filename = shift;
   my $self = bless {
     configfile => $filename,
+    modstatus => ''
   }, $class;
   open(CONF, "<$filename") || return undef;
 
@@ -30,10 +31,16 @@ sub new {
         my $coderef;
         eval { $coderef = Resmon::Module::fetch_monitor($current); };
         if (!$coderef) {
-                # Try to execute the config_as_hash method. If it fails, then
-                # the module didn't load properly (e.g. syntax error).
-                eval { $object->config_as_hash; };
-                die "Problem loading module $current" if $@;
+            # Try to execute the config_as_hash method. If it fails, then
+            # the module didn't load properly (e.g. syntax error).
+            eval { $object->config_as_hash; };
+            if ($@) {
+                # Module failed to load, print error and add to failed
+                # modules list.
+                print STDERR "Problem loading module $current\n";
+                print STDERR "This module will not be available\n";
+                $self->{'modstatus'} .= "$current ";
+            }
         }
 
       } elsif (/^\s*\}\s*$/) {

resmon

@@ -42,7 +42,10 @@ sub reconfigure {
     my $modules = $config->{Module};
     while ( my ($key, $value) = each(%$modules) ) {
         my $mod = $value->[0]; # Only need the first of each module
-        my $errs = $mod->reload_module();
+        # Called this way rather than $mod->reload_module() in order to deal
+        # with modules that failed to load on startup and won't have a
+        # reload_module method.
+        my $errs = Resmon::Module::reload_module($mod);
         if ($errs) {
             my $modname = ref($mod) || $mod;
             $modname =~ s/Resmon::Module:://;
@@ -112,8 +115,10 @@ while(1) {
         eval { ($check_rv, $check_mess) = $monobj->handler(); };
       }
       my $checkstat = $@;
+      my $confighash = {};
+      eval { $confighash = $monobj->config_as_hash(); };
       my $results = {
-        configuration => eval { $monobj->config_as_hash(); },
+        configuration => $confighash,
         last_runtime_seconds => sprintf("%.6f", tv_interval($starttime)),
       };
       if($checkstat) {