r44894 - in /trunk/libnagios-object-perl: Build.PL ChangeLog MANIFEST META.yml Nagios-Object-0.21.6.tar.gz debian/changelog lib/Nagios/Object.pm lib/Nagios/StatusLog.pm
ryan at users.alioth.debian.org
ryan at users.alioth.debian.org
Sat Sep 26 22:09:28 UTC 2009
Author: ryan
Date: Sat Sep 26 22:09:20 2009
New Revision: 44894
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44894
Log:
New upstream release
Removed:
trunk/libnagios-object-perl/Nagios-Object-0.21.6.tar.gz
Modified:
trunk/libnagios-object-perl/Build.PL
trunk/libnagios-object-perl/ChangeLog
trunk/libnagios-object-perl/MANIFEST
trunk/libnagios-object-perl/META.yml
trunk/libnagios-object-perl/debian/changelog
trunk/libnagios-object-perl/lib/Nagios/Object.pm
trunk/libnagios-object-perl/lib/Nagios/StatusLog.pm
Modified: trunk/libnagios-object-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/Build.PL?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/Build.PL (original)
+++ trunk/libnagios-object-perl/Build.PL Sat Sep 26 22:09:20 2009
@@ -4,7 +4,7 @@
my $build = Module::Build->new(
dist_name => 'Nagios-Object',
- dist_version => "0.21.7",
+ dist_version => "0.21.8",
dist_author => 'Duncan Ferguson <duncs at cpan.org>',
dist_abstract => 'Nagios::Object - Nagios object configuration parsing.',
license => 'gpl',
Modified: trunk/libnagios-object-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/ChangeLog?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/ChangeLog (original)
+++ trunk/libnagios-object-perl/ChangeLog Sat Sep 26 22:09:20 2009
@@ -103,3 +103,5 @@
0.21.7 - Apply patch from PJNewman - RT#47912
- Apply patch from Neil Katin - RT#48282
- Run 'perltidy -pbp' across all perl code
+0.21.8 - Apply speedup patch for v2 to v3 from PJNewman's patch (RT#47912)
+ - Apply patch from Stephen Gran to add in more missing methods (RT#49411)
Modified: trunk/libnagios-object-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/MANIFEST?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/MANIFEST (original)
+++ trunk/libnagios-object-perl/MANIFEST Sat Sep 26 22:09:20 2009
@@ -14,7 +14,6 @@
lib/Nagios/StatusLog.pm
MANIFEST
META.yml
-Nagios-Object-0.21.6.tar.gz
README
t/00object.t
t/01object-inheritance.t
Modified: trunk/libnagios-object-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/META.yml?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/META.yml (original)
+++ trunk/libnagios-object-perl/META.yml Sat Sep 26 22:09:20 2009
@@ -1,6 +1,6 @@
---
name: Nagios-Object
-version: 0.21.7
+version: 0.21.8
author:
- 'Duncan Ferguson <duncs at cpan.org>'
abstract: 'Nagios::Object - Nagios object configuration parsing.'
@@ -37,7 +37,7 @@
version: 0.1
Nagios::Object:
file: lib/Nagios/Object.pm
- version: 39
+ version: 40
Nagios::Object::Config:
file: lib/Nagios/Object/Config.pm
version: 36
@@ -55,7 +55,7 @@
version: 0
Nagios::StatusLog:
file: lib/Nagios/StatusLog.pm
- version: 39
+ version: 40
generated_by: Module::Build version 0.33
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
Modified: trunk/libnagios-object-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/changelog?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/changelog (original)
+++ trunk/libnagios-object-perl/debian/changelog Sat Sep 26 22:09:20 2009
@@ -1,8 +1,9 @@
-libnagios-object-perl (0.21.7-2) UNRELEASED; urgency=low
+libnagios-object-perl (0.21.8-1) UNRELEASED; urgency=low
* Update ryan52's email address
+ * New upstream release
- -- Ryan Niebur <ryan at debian.org> Fri, 25 Sep 2009 00:25:41 -0700
+ -- Ryan Niebur <ryan at debian.org> Sat, 26 Sep 2009 15:08:53 -0700
libnagios-object-perl (0.21.7-1) unstable; urgency=low
Modified: trunk/libnagios-object-perl/lib/Nagios/Object.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/lib/Nagios/Object.pm?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/lib/Nagios/Object.pm (original)
+++ trunk/libnagios-object-perl/lib/Nagios/Object.pm Sat Sep 26 22:09:20 2009
@@ -28,7 +28,7 @@
# NOTE: due to CPAN version checks this cannot currently be changed to a
# standard version string, i.e. '0.21'
-our $VERSION = '39';
+our $VERSION = '40';
our $pre_link = undef;
our $fast_mode = undef;
our %nagios_setup;
@@ -71,6 +71,7 @@
Service => {
use => [ 'Nagios::Service', 10 ],
service_description => [ 'STRING', 10 ],
+ display_name => ['STRING', 280],
host_name => [ ['Nagios::Host'], 10 ],
servicegroups => [ ['Nagios::ServiceGroup'], 280 ],
hostgroup_name => [ ['Nagios::HostGroup'], 256 ],
@@ -293,6 +294,7 @@
notification_interval => [ 'INTEGER', 280 ],
name => [ 'host_name', 280 ],
comment => [ 'comment', 280 ],
+ escalation_options => [[qw(d u r)], 280 ],
file => [ 'filename', 280 ]
},
HostDependency => {
Modified: trunk/libnagios-object-perl/lib/Nagios/StatusLog.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/lib/Nagios/StatusLog.pm?rev=44894&op=diff
==============================================================================
--- trunk/libnagios-object-perl/lib/Nagios/StatusLog.pm (original)
+++ trunk/libnagios-object-perl/lib/Nagios/StatusLog.pm Sat Sep 26 22:09:20 2009
@@ -25,7 +25,7 @@
# NOTE: due to CPAN version checks this cannot currently be changed to a
# standard version string, i.e. '0.21'
-our $VERSION = '39';
+our $VERSION = '40';
# this is going to be rewritten to use AUTOLOAD + method caching in a future version
BEGIN {
@@ -471,16 +471,18 @@
(.*)$
/xs;
- my $entry = '';
- while ( my $line = <$log_fh> ) {
- next if ( $line =~ /^\s*#/ );
- $entry .= $line;
- if ( $entry =~ m/$entry_re/ ) {
- ( my $type, my $text, $entry ) = ( $1, $2, $3 );
- $text =~ s/[\r\n]+\s*/\n/g; # clean up whitespace and newlines
- my %item = map { split /\s*=\s*/, $_, 2 } split /\n/, $text;
- $handlers{$type}->( \%item );
- }
+ my @lines = <$log_fh>;
+ my $file = "@lines";
+
+#Drop comments if we don't need them as it should speed things up a little bit.
+#Comment out the line below if you do want to keep comments
+ $file =~ s/#.*\n//mg;
+ $file =~ s/[\r\n]+\s*/\n/g; # clean up whitespace and newlines
+
+ while ( $file =~ /$entry_re/g ) {
+ ( my $type, my $text ) = ( $1, $2 );
+ my %item = map { split /\s*=\s*/, $_, 2 } split /\n/, $text;
+ $handlers{$type}->( \%item );
}
close($log_fh);
More information about the Pkg-perl-cvs-commits
mailing list