Changes - j0ke.net Open Build Service

Changes of Revision 12

[-] [+]	Changed	icinga-nagtrap.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Mar 19 07:37:41 UTC 2018 - cs@linux-administrator.com + +- add DBIx::DBCluster support + +------------------------------------------------------------------- Fri Nov 1 10:00:26 UTC 2013 - cs@linux-administrator.com - initial package build
[-] [+]	Changed	icinga-nagtrap.spec ^
@@ -23,7 +23,7 @@ Name: %{monitor}-%{pkgname} Version: 1.5.0 -Release: 1 +Release: 20 Summary: Nagios/Icinga webinterface for snmptt Url: https://icinga.org/display/howtos/NagTrap Source0: %{pkgname}-%{version}.tar.bz2 @@ -31,6 +31,7 @@ Patch1: %{pkgname}-%{version}_dbschema.patch Patch2: %{pkgname}-%{version}_plugin.patch Patch3: %{pkgname}-step.patch +Patch4: %{pkgname}-%{version}_DBIx-DBCluster.patch License: GPL-2 Group: Application/System BuildRoot: %{_tmppath}/%{monitor}-%{pkgname}-%{version}-root @@ -46,6 +47,8 @@ %package plugins Group: Application/System Summary: Plugins for nagtrap +BuildRequires: perl-DBIx-DBCluster +Requires: perl-DBIx-DBCluster %description plugins Nagtrap plugins to check for new traps & jobs. @@ -56,6 +59,7 @@ %patch1 %patch2 %patch3 +%patch4 %build ./configure \
[-] [+]	Added	nagtrap-1.5.0_DBIx-DBCluster.patch ^
@@ -0,0 +1,44 @@ +Index: plugin/check_snmptraps.pl.in +=================================================================== +--- plugin/check_snmptraps.pl.in (Revision 11721) ++++ plugin/check_snmptraps.pl.in (Arbeitskopie) +@@ -59,6 +59,7 @@ + use utils qw($TIMEOUT %ERRORS &print_revision &support); + use Time::HiRes qw(time); + use DBI(); ++use DBIx::DBCluster; + # ==================== Database connect information ==================== + our $dbHost; + our $dbName; +@@ -229,7 +230,8 @@ + } + + # Connect to the database. +-my $dbConnect = DBI->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| ++#my $dbConnect = DBI->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| ++my $dbConnect = DBIx::DBCluster->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| + die "ERROR - Can't connect to MySQL-Database: ".$DBI::errstr."\n"; + &debug(1,"Connect to DB: TRUE"); + +Index: plugin/check_jobs.pl.in +=================================================================== +--- plugin/check_jobs.pl.in (Revision 11721) ++++ plugin/check_jobs.pl.in (Arbeitskopie) +@@ -44,6 +44,7 @@ + use utils qw($TIMEOUT %ERRORS &print_revision &support); + use Time::HiRes qw(time); + use DBI(); ++use DBIx::DBCluster; + # ==================== Database connect information ==================== + our $dbHost; + our $dbName; +@@ -141,7 +142,8 @@ + &debug(0); + + # Connect to the database. +-my $dbConnect = DBI->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| ++#my $dbConnect = DBI->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| ++my $dbConnect = DBIx::DBCluster->connect("DBI:mysql:database=$dbName;host=$dbHost","$dbUser","$dbPass") \|\| + die "ERROR - Can't connect to MySQL-Database: ".$DBI::errstr."\n"; + &debug(1,"Connect to DB: TRUE"); +