Title: [opsview] [12972] Install plugins from opspacks every time (used to only install plugins
- Revision
- 12972
- Author
- tvoon
- Date
- 2013-07-17 13:27:13 +0100 (Wed, 17 Jul 2013)
Log Message
Install plugins from opspacks every time (used to only install plugins
if version was different from current)
Modified Paths
Modified: trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-07-17 12:21:07 UTC (rev 12971)
+++ trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-07-17 12:27:13 UTC (rev 12972)
@@ -242,6 +242,22 @@
}
}
+ # Add plugins here, regardless of opspack version
+ $self->add_plugins( $packdir, $logger, $schema );
+
+ # This should belong in add_plugins, when the plugin.d
+ # changes to be plugin based
+ if ( -d "$packdir/plugin.d" ) {
+ $logger->info( "Installing extra files for $packdir" );
+
+ my $dest = "/usr/local/nagios/libexec/plugin.d/$packdir";
+ rmtree($dest) if -d $dest;
+ rcopy( "$packdir/plugin.d", $dest ) or do {
+ $logger->logdie( "Could not move $packdir/plugin.d into $dest: $!"
+ );
+ };
+ }
+
my $mpack = $self->find_or_new( { name => $info->{name} } );
unless ( $mpack->in_storage ) {
$mpack->insert;
@@ -291,22 +307,6 @@
# Check dependencies - TODO
my @deps = $self->parse_dependencies( $info->{dependencies} );
- # Add plugins here, regardless of conflicts
- $self->add_plugins( $packdir, $logger, $schema );
-
- # This should belong in add_plugins, when the plugin.d
- # changes to be plugin based
- if ( -d "$packdir/plugin.d" ) {
- $logger->info( "Installing extra files for $packdir" );
-
- my $dest = "/usr/local/nagios/libexec/plugin.d/$packdir";
- rmtree($dest) if -d $dest;
- rcopy( "$packdir/plugin.d", $dest ) or do {
- $logger->logdie( "Could not move $packdir/plugin.d into $dest: $!"
- );
- };
- }
-
# Read config.json
open F, "$packdir/config.json" or do {
$mpack->update( { status => "FAILURE" } );
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
