[icinga-checkins] icinga.org: icinga-core/fholzer/core: delete getop for mysqldb

git at icinga.org git at icinga.org
Mon Apr 23 14:12:18 CEST 2012


Module: icinga-core
Branch: fholzer/core
Commit: db47b1f750da85246d79b554c894db35180787b2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=db47b1f750da85246d79b554c894db35180787b2

Author: Franz Holzer <office at frankstar.at>
Date:   Mon Apr 23 13:51:42 2012 +0200

delete getop for mysqldb

---

 tools/icinga_verification.pl |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/icinga_verification.pl b/tools/icinga_verification.pl
index 485ce31..e2fda22 100644
--- a/tools/icinga_verification.pl
+++ b/tools/icinga_verification.pl
@@ -45,15 +45,13 @@ my $config_ref = {
         apache2 => { binaries => [ 'httpd', 'apache2' ] },
         mysql => { binaries => [ 'mysqld' ] },
         icinga => { binaries => [ 'icinga' ] },
-        ido2db => { binaries => [ 'snmptt' ] },
+        ido2db => { binaries => [ 'ido2db' ] },
     }
 };
 
 ################################
 # Option parsing
 ################################
-my $mysqldb = '';
-#my $result = GetOptions( "icingadb=s" => \$mysqldb );
 
 ################################
 # Script Config
@@ -95,7 +93,7 @@ my $mysqlpw_cfg = get_key_from_ini("$icinga_base/ido2db.cfg", 'db_pass');
 #Mysql Server Check
 my $mysqlcheck = which('mysql');
 
-my ($dbh_cfg, $dbh_cfg_error, $icinga_dbversion, $sth, $sth1) = '';
+my ($dbh_cfg, $dbh_cfg_error, $icinga_dbversion, $sth, $sth1, $mysqldb) = '';
 
 if ( !$mysqlcheck ) {
     print "mysql not found, skipping\n";
@@ -365,8 +363,7 @@ sub which (@) {
     push @path, $icinga_path;
 
     foreach my $binary (@binaries) {
-        map { -x "$_/$binary" && return "$_/$binary" }
-            @path );
+        map { -x "$_/$binary" && return "$_/$binary" }@path;
     }
     return undef;
 }





More information about the icinga-checkins mailing list