Title: [opsview] [12956] Revert old logic to create plugins.d/PACKNAME, rather than desired plugins.d/PLUGINNAME
- Revision
- 12956
- Author
- tvoon
- Date
- 2013-07-16 15:08:20 +0100 (Tue, 16 Jul 2013)
Log Message
Revert old logic to create plugins.d/PACKNAME, rather than desired plugins.d/PLUGINNAME
Modified Paths
Modified: trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-07-16 13:07:01 UTC (rev 12955)
+++ trunk/opsview-core/lib/Opsview/ResultSet/MonitorPacks.pm 2013-07-16 14:08:20 UTC (rev 12956)
@@ -112,31 +112,31 @@
}
}
+ # TODO: Use plugin.d/PLUGINNAME, rather than plugin.d/PACKNAME
+ # Will need to go over all plugins to find references to plugin.d
# Copy 'plugin.d' dir.
- if ( -d "$packdir/plugin.d" ) {
- $logger->info( "Installing extra files for $packdir" );
-
- # FOREACH directory
- opendir DIR, "$packdir/plugin.d" or do {
- $logger->error( "Cannot read $packdir/plugin.d: $!" );
- return;
- };
- my @plugins = grep !/^\.\.?/, readdir DIR;
- closedir DIR;
-
- foreach my $p (@plugins) {
- my $dest = "$plugindir/plugins.d/$p";
- rmtree($dest) if -d $dest;
- rcopy( "$packdir/plugin.d/$p", $dest ) or do {
- $logger->error(
- "Could not move $packdir/plugin.d into $dest: $!"
- );
- next;
- };
- $logger->info( "Installed into $dest" );
- }
-
- }
+ #if ( -d "$packdir/plugin.d" ) {
+ # $logger->info( "Installing extra files for $packdir" );
+ #
+ # opendir DIR, "$packdir/plugin.d" or do {
+ # $logger->error( "Cannot read $packdir/plugin.d: $!" );
+ # return;
+ # };
+ # my @plugins = grep !/^\.\.?/, readdir DIR;
+ # closedir DIR;
+ # foreach my $p (@plugins) {
+ # my $dest = "$plugindir/plugins.d/$p";
+ # rmtree($dest) if -d $dest;
+ # rcopy( "$packdir/plugin.d/$p", $dest ) or do {
+ # $logger->error(
+ # "Could not move $packdir/plugin.d into $dest: $!"
+ # );
+ # next;
+ # };
+ # $logger->info( "Installed into $dest" );
+ # }
+ #
+ #}
}
sub check_conflicts {
@@ -294,6 +294,19 @@
# 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
