>From 196d3cff420212d82294ae9562b36f8d7c1d8ade Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 23 Dec 2016 18:46:07 +0100 Subject: Imported Upstream version 0.78 --- Changes | 3 ++ MANIFEST | 2 -- META.yml | 4 +-- inc/Module/AutoInstall.pm | 4 +-- inc/Module/Install.pm | 2 +- inc/Module/Install/AutoInstall.pm | 2 +- inc/Module/Install/Base.pm | 2 +- inc/Module/Install/Can.pm | 2 +- inc/Module/Install/Fetch.pm | 2 +- inc/Module/Install/Include.pm | 2 +- inc/Module/Install/Makefile.pm | 2 +- inc/Module/Install/Metadata.pm | 2 +- inc/Module/Install/Win32.pm | 2 +- inc/Module/Install/WriteAll.pm | 2 +- lib/Monitoring/Livestatus.pm | 46 ++++++++++++++++-------- t/01-Monitoring-Livestatus-basic_tests.t | 8 ++--- t/20-Monitoring-Livestatus-test_socket.t | 18 +++++----- t/21-Monitoring-Livestatus-INET.t | 8 ++--- t/22-Monitoring-Livestatus-UNIX.t | 8 ++--- t/23-Monitoring-Livestatus-BigData.t | 15 ++++---- t/30-Monitoring-Livestatus-live-test.t | 16 ++++----- t/32-Monitoring-Livestatus-backend-test.t | 4 +-- t/33-Monitoring-Livestatus-test_socket_timeout.t | 2 +- t/34-Monitoring-Livestatus-utf8_support.t | 2 +- 24 files changed, 87 insertions(+), 73 deletions(-) diff --git a/Changes b/Changes index 6432902..d604414 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for Perl extension Monitoring::Livestatus. +0.78 Fri Dec 23 17:09:35 CET 2016 + - fix spelling errors (#5) + 0.76 Tue Sep 27 21:45:25 CEST 2016 - fix utf-8 decoding error: missing high surrogate character in surrogate pair - fixed typo diff --git a/MANIFEST b/MANIFEST index 9295acc..617c5ba 100644 --- a/MANIFEST +++ b/MANIFEST @@ -21,13 +21,11 @@ META.yml README t/01-Monitoring-Livestatus-basic_tests.t t/02-Monitoring-Livestatus-internals.t -t/03-Monitoring-Livestatus-MULTI-internals.t t/20-Monitoring-Livestatus-test_socket.t t/21-Monitoring-Livestatus-INET.t t/22-Monitoring-Livestatus-UNIX.t t/23-Monitoring-Livestatus-BigData.t t/30-Monitoring-Livestatus-live-test.t -t/31-Monitoring-Livestatus-MULTI-live-test.t t/32-Monitoring-Livestatus-backend-test.t t/33-Monitoring-Livestatus-test_socket_timeout.t t/34-Monitoring-Livestatus-utf8_support.t diff --git a/META.yml b/META.yml index 2c07561..12734db 100644 --- a/META.yml +++ b/META.yml @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: 6.59 distribution_type: module dynamic_config: 1 -generated_by: 'Module::Install version 1.16' +generated_by: 'Module::Install version 1.14' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -33,4 +33,4 @@ resources: homepage: http://search.cpan.org/dist/Monitoring-Livestatus/ license: http://dev.perl.org/licenses/ repository: http://github.com/sni/Monitoring-Livestatus -version: '0.76' +version: '0.78' diff --git a/inc/Module/AutoInstall.pm b/inc/Module/AutoInstall.pm index 22dfa82..cd93d14 100644 --- a/inc/Module/AutoInstall.pm +++ b/inc/Module/AutoInstall.pm @@ -8,7 +8,7 @@ use ExtUtils::MakeMaker (); use vars qw{$VERSION}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; } # special map on pre-defined feature sets @@ -537,7 +537,7 @@ sub _install_cpan { while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) { ( $args{$opt} = $arg, next ) if $opt =~ /^(?:force|notest)$/; # pseudo-option - $CPAN::Config->{$opt} = $opt eq 'urllist' ? [$arg] : $arg; + $CPAN::Config->{$opt} = $arg; } if ($args{notest} && (not CPAN::Shell->can('notest'))) { diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm index f44ab4d..ff767fa 100644 --- a/inc/Module/Install.pm +++ b/inc/Module/Install.pm @@ -31,7 +31,7 @@ BEGIN { # This is not enforced yet, but will be some time in the next few # releases once we can make sure it won't clash with custom # Module::Install extensions. - $VERSION = '1.16'; + $VERSION = '1.14'; # Storage for the pseudo-singleton $MAIN = undef; diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm index e19d259..475303e 100644 --- a/inc/Module/Install/AutoInstall.pm +++ b/inc/Module/Install/AutoInstall.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm index 5762a74..4206347 100644 --- a/inc/Module/Install/Base.pm +++ b/inc/Module/Install/Base.pm @@ -4,7 +4,7 @@ package Module::Install::Base; use strict 'vars'; use vars qw{$VERSION}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; } # Suspend handler for "redefined" warnings diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm index d859276..9929b1b 100644 --- a/inc/Module/Install/Can.pm +++ b/inc/Module/Install/Can.pm @@ -8,7 +8,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm index 41d3517..3d8de76 100644 --- a/inc/Module/Install/Fetch.pm +++ b/inc/Module/Install/Fetch.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm index 2eb1d1f..f274f87 100644 --- a/inc/Module/Install/Include.pm +++ b/inc/Module/Install/Include.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm index e9918d2..66993af 100644 --- a/inc/Module/Install/Makefile.pm +++ b/inc/Module/Install/Makefile.pm @@ -8,7 +8,7 @@ use Fcntl qw/:flock :seek/; use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm index 9792685..e547fa0 100644 --- a/inc/Module/Install/Metadata.pm +++ b/inc/Module/Install/Metadata.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm index 218a66b..9706e5f 100644 --- a/inc/Module/Install/Win32.pm +++ b/inc/Module/Install/Win32.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = 'Module::Install::Base'; $ISCORE = 1; } diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm index 530749b..dbedc00 100644 --- a/inc/Module/Install/WriteAll.pm +++ b/inc/Module/Install/WriteAll.pm @@ -6,7 +6,7 @@ use Module::Install::Base (); use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '1.16'; + $VERSION = '1.14'; @ISA = qw{Module::Install::Base}; $ISCORE = 1; } diff --git a/lib/Monitoring/Livestatus.pm b/lib/Monitoring/Livestatus.pm index d6785b4..03be3f0 100644 --- a/lib/Monitoring/Livestatus.pm +++ b/lib/Monitoring/Livestatus.pm @@ -12,7 +12,7 @@ use Storable qw/dclone/; use Monitoring::Livestatus::INET qw//; use Monitoring::Livestatus::UNIX qw//; -our $VERSION = '0.76'; +our $VERSION = '0.78'; # list of allowed options @@ -84,21 +84,21 @@ address verbose mode -=item line_seperator +=item line_separator -ascii code of the line seperator, defaults to 10, (newline) +ascii code of the line separator, defaults to 10, (newline) -=item column_seperator +=item column_separator -ascii code of the column seperator, defaults to 0 (null byte) +ascii code of the column separator, defaults to 0 (null byte) -=item list_seperator +=item list_separator -ascii code of the list seperator, defaults to 44 (comma) +ascii code of the list separator, defaults to 44 (comma) -=item host_service_seperator +=item host_service_separator -ascii code of the host/service seperator, defaults to 124 (pipe) +ascii code of the host/service separator, defaults to 124 (pipe) =item keepalive @@ -143,10 +143,10 @@ sub new { 'server' => undef, # use tcp connections 'peer' => undef, # use for socket / server connections 'name' => undef, # human readable name - 'line_seperator' => 10, # defaults to newline - 'column_seperator' => 0, # defaults to null byte - 'list_seperator' => 44, # defaults to comma - 'host_service_seperator' => 124, # defaults to pipe + 'line_separator' => 10, # defaults to newline + 'column_separator' => 0, # defaults to null byte + 'list_separator' => 44, # defaults to comma + 'host_service_separator' => 124, # defaults to pipe 'keepalive' => 0, # enable keepalive? 'errors_are_fatal' => 1, # die on errors 'backend' => undef, # should be keept undef, used internally @@ -160,6 +160,22 @@ sub new { 'retry_interval' => 1, # retry after x seconds }; + my %old_key = ( + line_seperator => 'line_separator', + column_seperator => 'column_separator', + list_seperator => 'list_separator', + host_service_seperator => 'host_service_separator', + ); + + # previous versions had spelling errors in the key name + for my $opt_key (keys %old_key) { + if(exists $options{$opt_key}) { + my $value = $options{$opt_key}; + $options{ $old_key{$opt_key} } = $value; + delete $options{$opt_key}; + } + } + for my $opt_key (keys %options) { if(exists $self->{$opt_key}) { $self->{$opt_key} = $options{$opt_key}; @@ -1013,7 +1029,7 @@ useful when using multiple backends. deep copy/clone the result set. Only effective when using multiple backends and threads. - This can be safely turned off if you dont change the + This can be safely turned off if you don't change the result set. If you get an error like "Invalid value for shared scalar" error" this should be turned on. @@ -1382,7 +1398,7 @@ sub _get_error { '452' => 'internal livestatus error', '490' => 'no query', '491' => 'failed to connect', - '492' => 'Separators not allowed in statement. Please use the seperator options in new()', + '492' => 'Separators not allowed in statement. Please use the separator options in new()', '493' => 'OuputFormat not allowed in statement. Header will be set automatically', '494' => 'ColumnHeaders not allowed in statement. Header will be set automatically', '495' => 'ResponseHeader not allowed in statement. Header will be set automatically', diff --git a/t/01-Monitoring-Livestatus-basic_tests.t b/t/01-Monitoring-Livestatus-basic_tests.t index 695b008..0bcb6e8 100644 --- a/t/01-Monitoring-Livestatus-basic_tests.t +++ b/t/01-Monitoring-Livestatus-basic_tests.t @@ -37,13 +37,13 @@ is($ml->peer_addr(), $socket_path, 'get peer_addr()'); ######################### # create object with hash args -my $line_seperator = 10; -my $column_seperator = 0; +my $line_separator = 10; +my $column_separator = 0; $ml = Monitoring::Livestatus->new( verbose => 0, socket => $socket_path, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ); isa_ok($ml, 'Monitoring::Livestatus', 'new hash args'); is($ml->peer_name(), $socket_path, 'get peer_name()'); diff --git a/t/20-Monitoring-Livestatus-test_socket.t b/t/20-Monitoring-Livestatus-test_socket.t index ab37e44..3fd490e 100644 --- a/t/20-Monitoring-Livestatus-test_socket.t +++ b/t/20-Monitoring-Livestatus-test_socket.t @@ -16,8 +16,8 @@ BEGIN { elsif( $^O eq 'MSWin32' ) { plan skip_all => 'no sockets on windows'; } - elsif( $^V ge v5.24 ) { - plan skip_all => 'JSON::XS will not work in threaded perl >= 5.24'; + elsif( $^V ge v5.22 ) { + plan skip_all => 'JSON::XS will not work in threaded perl >= 5.22'; } else{ plan tests => 109 @@ -30,8 +30,8 @@ BEGIN { use_ok('Monitoring::Livestatus') }; ######################### # Normal Querys ######################### -my $line_seperator = 10; -my $column_seperator = 0; +my $line_separator = 10; +my $column_separator = 0; my $test_data = [ ["alias","name","contacts"], # table header ["alias1","host1","contact1"], # row 1 ["alias2","host2","contact2"], # row 2 @@ -112,8 +112,8 @@ my $objects_to_test = { 'unix_hash_args' => Monitoring::Livestatus->new( verbose => 0, socket => $socket_path, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ), # create unix object with a single arg @@ -123,8 +123,8 @@ my $objects_to_test = { 'inet_hash_args' => Monitoring::Livestatus->new( verbose => 0, server => $server, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ), # create inet object with a single arg @@ -136,7 +136,7 @@ for my $key (keys %{$objects_to_test}) { my $ml = $objects_to_test->{$key}; isa_ok($ml, 'Monitoring::Livestatus'); - # we dont need warnings for testing + # we don't need warnings for testing $ml->warnings(0); ################################################## diff --git a/t/21-Monitoring-Livestatus-INET.t b/t/21-Monitoring-Livestatus-INET.t index 1ecc8b0..565cb42 100644 --- a/t/21-Monitoring-Livestatus-INET.t +++ b/t/21-Monitoring-Livestatus-INET.t @@ -19,12 +19,12 @@ isa_ok($ml, 'Monitoring::Livestatus', 'Monitoring::Livestatus::INET->new()'); ######################### # create object with hash args -my $line_seperator = 10; -my $column_seperator = 0; +my $line_separator = 10; +my $column_separator = 0; $ml = Monitoring::Livestatus::INET->new( verbose => 0, server => $server, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ); isa_ok($ml, 'Monitoring::Livestatus', 'Monitoring::Livestatus::INET->new(%args)'); diff --git a/t/22-Monitoring-Livestatus-UNIX.t b/t/22-Monitoring-Livestatus-UNIX.t index 4b17813..006dcb2 100644 --- a/t/22-Monitoring-Livestatus-UNIX.t +++ b/t/22-Monitoring-Livestatus-UNIX.t @@ -15,12 +15,12 @@ isa_ok($ml, 'Monitoring::Livestatus', 'Monitoring::Livestatus::UNIX->new()'); ######################### # create object with hash args -my $line_seperator = 10; -my $column_seperator = 0; +my $line_separator = 10; +my $column_separator = 0; $ml = Monitoring::Livestatus::UNIX->new( verbose => 0, socket => $socket, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ); isa_ok($ml, 'Monitoring::Livestatus', 'Monitoring::Livestatus::UNIX->new(%args)'); diff --git a/t/23-Monitoring-Livestatus-BigData.t b/t/23-Monitoring-Livestatus-BigData.t index 7107c10..a491b05 100644 --- a/t/23-Monitoring-Livestatus-BigData.t +++ b/t/23-Monitoring-Livestatus-BigData.t @@ -3,7 +3,7 @@ ######################### use strict; -use Test::More tests => 14; +use Test::More tests => 13; BEGIN { use_ok('Monitoring::Livestatus') }; my $testport = 60123; @@ -24,16 +24,13 @@ for my $x (1..$testresults) { } print $fh "]\n"; close($fh); -ok(-f $testfile, "testfile: ".$testfile.".data written"); +ok(-f $testfile.".data", "testfile: ".$testfile.".data written"); -chomp(my $size = `du -h $testfile.data`); -ok($size, $size); - -chomp(my $bytes = `du -b $testfile.data | awk '{print \$1}'`); -ok($bytes, 'testfile has '.$bytes.' bytes'); +my $size = -s $testfile.".data"; +ok($size, "file has $size bytes"); open($fh, '>', $testfile.'.head') or die($testfile.'.head: '.$!); -printf($fh "200 %12d\n", $bytes); +printf($fh "200 %12d\n", $size); close($fh); `cat $testfile.head $testfile.data > $testfile`; unlink($testfile.'.head', $testfile.'.data'); @@ -44,7 +41,7 @@ ok($mem_start, sprintf('memory at start: %.2f MB', $mem_start/1024)); ########################################################## # start netcat -`netcat -vvv -w 3 -l -p $testport >/tmp/blah 2>&1 < $testfile &`; +`netcat -vvv -w 3 -l -p $testport >/dev/null 2>&1 < $testfile &`; sleep(0.1); ok(1, "netcat started"); diff --git a/t/30-Monitoring-Livestatus-live-test.t b/t/30-Monitoring-Livestatus-live-test.t index a4aaa79..82906dd 100644 --- a/t/30-Monitoring-Livestatus-live-test.t +++ b/t/30-Monitoring-Livestatus-live-test.t @@ -27,8 +27,8 @@ use_ok('Monitoring::Livestatus::INET'); use_ok('Monitoring::Livestatus::UNIX'); ######################### -my $line_seperator = 10; -my $column_seperator = 0; +my $line_separator = 10; +my $column_separator = 0; my $objects_to_test = { # UNIX # create unix object with a single arg @@ -38,8 +38,8 @@ my $objects_to_test = { '02 unix_few_args' => Monitoring::Livestatus->new( #verbose => 1, socket => $ENV{TEST_SOCKET}, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ), # create unix object with hash args @@ -57,8 +57,8 @@ my $objects_to_test = { '05 inet_few_args' => Monitoring::Livestatus->new( verbose => 0, server => $ENV{TEST_SERVER}, - line_seperator => $line_seperator, - column_seperator => $column_seperator, + line_separator => $line_separator, + column_separator => $column_separator, ), @@ -179,7 +179,7 @@ for my $key (sort keys %{$objects_to_test}) { my $ml = $objects_to_test->{$key}; isa_ok($ml, 'Monitoring::Livestatus') or BAIL_OUT("no need to continue without a proper Monitoring::Livestatus object: ".$key); - # dont die on errors + # don't die on errors $ml->errors_are_fatal(0); $ml->warnings(0); @@ -238,7 +238,7 @@ for my $key (sort keys %{$objects_to_test}) { ######################### # send a test command - # commands still dont work and breaks livestatus + # commands still don't work and breaks livestatus my $rt = $ml->do('COMMAND ['.time().'] SAVE_STATE_INFORMATION'); is($rt, '1', $key.' test command'); diff --git a/t/32-Monitoring-Livestatus-backend-test.t b/t/32-Monitoring-Livestatus-backend-test.t index 89c5caa..2066645 100644 --- a/t/32-Monitoring-Livestatus-backend-test.t +++ b/t/32-Monitoring-Livestatus-backend-test.t @@ -11,7 +11,7 @@ if ( ! defined $ENV{TEST_SOCKET} or !defined $ENV{TEST_SERVER} or !defined $ENV{ my $msg = 'Author test. Set $ENV{TEST_SOCKET} and $ENV{TEST_SERVER} and $ENV{TEST_BACKEND} to run'; plan( skip_all => $msg ); } else { - # we dont know yet how many tests we got + # we don't know yet how many tests we got plan( tests => 57070 ); } @@ -39,7 +39,7 @@ for my $key (sort keys %{$objects_to_test}) { my $ml = $objects_to_test->{$key}; isa_ok($ml, 'Monitoring::Livestatus') or BAIL_OUT("no need to continue without a proper Monitoring::Livestatus object: ".$key); - # dont die on errors + # don't die on errors $ml->errors_are_fatal(0); $ml->warnings(0); diff --git a/t/33-Monitoring-Livestatus-test_socket_timeout.t b/t/33-Monitoring-Livestatus-test_socket_timeout.t index 84e3ce9..75d52f0 100644 --- a/t/33-Monitoring-Livestatus-test_socket_timeout.t +++ b/t/33-Monitoring-Livestatus-test_socket_timeout.t @@ -53,7 +53,7 @@ for my $key (sort keys %{$objects_to_test}) { my $ml = $objects_to_test->{$key}; isa_ok($ml, 'Monitoring::Livestatus'); - # we dont need warnings for testing + # we don't need warnings for testing $ml->warnings(0); ######################### diff --git a/t/34-Monitoring-Livestatus-utf8_support.t b/t/34-Monitoring-Livestatus-utf8_support.t index c296bbc..b24958f 100644 --- a/t/34-Monitoring-Livestatus-utf8_support.t +++ b/t/34-Monitoring-Livestatus-utf8_support.t @@ -44,7 +44,7 @@ for my $key (sort keys %{$objects_to_test}) { my $ml = $objects_to_test->{$key}; isa_ok($ml, 'Monitoring::Livestatus'); - # we dont need warnings for testing + # we don't need warnings for testing $ml->warnings(0); ######################### -- 2.1.4