Changeset b4a01ee848c6689e508db6c683e95fd59cb17f28

Timestamp:

03/20/10 02:37:44 (3 years ago)

Author:

Mark Harrison <mark@omniti.com>

git-committer:

Mark Harrison <mark@omniti.com> 1269052664 +0000

git-parent:

[84fa9ac85ea06f95b5b8fb73360ff441d536e056]

git-author:

Mark Harrison <mark@omniti.com> 1269052664 +0000

Message:

Changes to how modules are loaded:

Each module is an object inheriting from Resmon::Module as before, but the
code to support coderefs and raw packages with a handler function is all gone.
In addition, a lot of redundant code was removed, and some small changes made
to the modules themselves:

• The check name is stored in $self->{check_name} (instead of
  $self->{object} as in the past)
  
• The check configuration is stored in $self->{config} and not just as
  instance variables.
  
• All modules must have fully qualified names in the config file. In other
  words - Resmon::Module::Resmon instead of just RESMON. In keeping with
  other perl module names, I've gone with Title Case instead of ALL CAPS
  for the sample module (Resmon). This is simple to change back if desired
  however.
  

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

Files:

• lib/Resmon/Config.pm (modified) (1 diff)
• lib/Resmon/Module.pm (modified) (1 diff, 1 prop)
• lib/Resmon/Module/RESMON.pm (deleted)
• lib/Resmon/Module/Resmon.pm (added)
• lib/Resmon/Status.pm (modified) (1 diff)
• resmon (modified) (3 diffs)

lib/Resmon/Config.pm

@@ -22 +22 @@
-        if($current) {
-            if(/^\s*([^:\s](?:[^:]*[^:\s])?)\s*:\s*(.+)\s*$/) {
-
-
-
+
+
-                my @params = split(/,/, $2);
-
+->
-                    @params;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                push(@{$self->{Module}->{$current}}, $object);
-
-                # Test to make sure the module actually works
-                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; };
-                    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*$/) {
-                $current = undef;

lib/Resmon/Module.pm

@@ -1 +1 @@
-package Resmon::Module;
+use strict;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-    eval "use Resmon::Module::$type;";
-    return undef;
-}
-
-sub register_monitor {
-    my ($type, $ref) = @_;
-    if(ref $ref eq 'CODE') {
-        $coderefs{$type} = $ref;
-    }
-    print STDERR "$rmloading $type monitor\n";
-}
-
-sub fresh_status {
-    my $arg = shift;
-    print STDERR $arg->{type} .
-        ": Warning: fresh_status() is deprecated, and no longer required.\n";
-    return undef;
-}
-
-sub fresh_status_msg {
-    # Deal with result caching if an 'interval' entry is placed in the config
-    # for that module
-    my $arg = shift;
-    return undef unless $arg->{interval};
-    my $now = time;
-    if(($arg->{lastupdate} + $arg->{interval}) >= $now) {
-        return $arg->{laststatus}, $arg->{lastmessage};
-    }
-    return undef;
-}
-sub cache_metrics {
-    my $arg = shift;
-    $arg->{lastmetrics} = shift;
-    $arg->{lastupdate} = time;
-}
-sub config_as_hash {
-    my $self = shift;
-    my $conf = {};
-    while(my ($key, $value) = each %$self) {
-        if(! ref $value) {
-            # only stash scalars here.
-            $conf->{$key} = $value;
-        }
-    }
-    return $conf;
-}
-
-sub reload_module {
-    my $self = shift;
-    my $class = ref($self) || $self;
-    $class =~ s/::/\//g;
-    my $file = $INC{"$class.pm"};
-    # Deal with modules loaded from a LIB directory and not in
-    # lib/Resmon/Module: try MODNAME.pm instead of Resmon/Module/MODNAME.pm
-    unless ($file) {
-        $class =~ s/^.*\/([^\/]+)$/\1/;
-        $file = $INC{"$class.pm"};
-    }
-    print STDERR "Reloading module: $class\n";
-#    my $fh = FileHandle->new($file);
-#    local($/);
-    my $redef = 0;
-    local($SIG{__WARN__}) = sub {
-        if($_[0] =~ /[Ss]ubroutine ([\w:]+) redefined/ ) {
-            $redef++;
-            return;
-        }
-        warn @_;
-    };
-#    eval <$fh>;
-    eval {do($file); die $@ if $@};
-    return $@ if $@;
-    return $redef;
-}
-
-$rmloading = "Demand loading";
-1;

lib/Resmon/Status.pm

@@ -493 +493 @@
-        $loaded{$type} = ();
-        foreach (@$mods) {
-object
+check_name
-        }
-    }

resmon

@@ -18 +18 @@
-use Resmon::ExtComm;
-use Resmon::Status;
-use Resmon::Module;
-
-GetOptions(
@@ -124 +123 @@
-while(1) {
-    while(my($module_name, $mod_configs) = each %{$config->{Module}}) {
-
-
-
-
+
+
-            my $starttime = [gettimeofday];
-            # Get old status if it hasn't expired
-Resmon::Module::fresh_status_msg($monobj
+$monitor_obj->get_cached_metrics(
-            # Otherwise, run the check
-            if (!$check_metric) {
-
+itor_
-                    $config->{'timeout'};
-                alarm($timeout);
-                eval {
-                    local $SIG{ALRM} = sub { die "alarm\n" };
-
-
-
-
-
+
-                };
-                alarm 0;
-                # Store the last metrics for use by fresh_status_msg later
-Resmon::Module::cache_metrics($monobj, 
+$monitor_obj->cache_metrics(
-            };
-            my $checkproblem = $@;
@@ -162 +155 @@
-                }
-            }
-obj->{'object
-obj->{'object
+itor_obj->{'check_name
+itor_obj->{'check_name
-                $results->{'metric'}, $debug);
-        }