fix handling of non-existing configuration files and test it

diff --git a/lib/PXElator/client.pm b/lib/PXElator/client.pm
index e07004e..8950cb1 100644 (file)
--- a/lib/PXElator/client.pm
+++ b/lib/PXElator/client.pm
@@ -11,6 +11,8 @@ use Carp qw/confess/;
 use server;
 use format;
 
+our $debug = $server::debug;
+
 sub mkbasedir {
        my $path = shift;
        $path =~ s{(^.*)/[^/]+$}{$1};
@@ -60,7 +62,7 @@ sub conf {
        } elsif ( -f $path ) {
                $value = read_file $path;
        } else {
-               confess "conf $name";
+               warn "# $name missing $path\n" if $debug;
        }
        return $value;
 }

diff --git a/lib/PXElator/t/client.t b/lib/PXElator/t/client.t
index f40dea2..6ef054d 100755 (executable)
--- a/lib/PXElator/t/client.t
+++ b/lib/PXElator/t/client.t
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use autodie;
 
-use Test::More tests => 13;
+use Test::More tests => 14;
 use Data::Dump qw/dump/;
 use English;
 
@@ -21,6 +21,8 @@ cmp_ok( client::conf( $host => 'test' ), 'eq', 'default', 'default' );
 ok( client::conf( $host => 'test' => 'value' ), 'conf set' );
 cmp_ok( client::conf( $host => 'test' ), 'eq', 'value', 'value' );
 
+ok( ! client::conf( $host => 'non-existing' ), 'conf non-existing' );
+
 ok( my $ip = client::next_ip( $mac ), 'next_ip' );
 diag $ip;