diff --git a/ddclient.in b/ddclient.in index 60858cd..44d27bd 100755 --- a/ddclient.in +++ b/ddclient.in @@ -2358,7 +2358,7 @@ sub logmsg { chomp($buffer); my $prefix = $args{label}; - $prefix = sprintf "%-8s ", $prefix if $prefix; + $prefix = sprintf("%-8s ", $prefix . ':') if $prefix; if ($file) { $prefix .= "file $file"; $prefix .= ", line $lineno" if $lineno; @@ -2383,12 +2383,12 @@ sub logmsg { } } sub _logmsg_fmt { return (@_ > 1) ? sprintf(shift, @_) : shift; } -sub info { logmsg(email => 1, label => 'INFO:', _logmsg_fmt(@_)) if opt('verbose'); } -sub debug { logmsg( label => 'DEBUG:', _logmsg_fmt(@_)) if opt('debug'); } -sub warning { logmsg(email => 1, label => 'WARNING:', _logmsg_fmt(@_)); } -sub fatal { logmsg(email => 1, label => 'FATAL:', _logmsg_fmt(@_)); sendmail(); exit(1); } -sub success { logmsg(email => 1, label => 'SUCCESS:', _logmsg_fmt(@_)); } -sub failed { logmsg(email => 1, label => 'FAILED:', _logmsg_fmt(@_)); $result = 'FAILED'; } +sub info { logmsg(email => 1, label => 'INFO', _logmsg_fmt(@_)) if opt('verbose'); } +sub debug { logmsg( label => 'DEBUG', _logmsg_fmt(@_)) if opt('debug'); } +sub warning { logmsg(email => 1, label => 'WARNING', _logmsg_fmt(@_)); } +sub fatal { logmsg(email => 1, label => 'FATAL', _logmsg_fmt(@_)); sendmail(); exit(1); } +sub success { logmsg(email => 1, label => 'SUCCESS', _logmsg_fmt(@_)); } +sub failed { logmsg(email => 1, label => 'FAILED', _logmsg_fmt(@_)); $result = 'FAILED'; } sub prettytime { return scalar(localtime(shift)); } diff --git a/t/logmsg.pl b/t/logmsg.pl index 8a3d9f3..5f2fd6e 100644 --- a/t/logmsg.pl +++ b/t/logmsg.pl @@ -54,22 +54,22 @@ my @test_cases = ( }, { desc => 'single-line label', - args => [label => 'LBL:', 'foo'], + args => [label => 'LBL', 'foo'], want => "LBL: > foo\n", }, { desc => 'multi-line label', - args => [label => 'LBL:', "foo\nbar"], + args => [label => 'LBL', "foo\nbar"], want => "LBL: > foo\nLBL: bar\n", }, { desc => 'single-line long label', - args => [label => 'VERY LONG LABEL:', 'foo'], + args => [label => 'VERY LONG LABEL', 'foo'], want => "VERY LONG LABEL: > foo\n", }, { desc => 'multi-line long label', - args => [label => 'VERY LONG LABEL:', "foo\nbar"], + args => [label => 'VERY LONG LABEL', "foo\nbar"], want => "VERY LONG LABEL: > foo\nVERY LONG LABEL: bar\n", }, { @@ -87,14 +87,14 @@ my @test_cases = ( }, { desc => 'single line, label, file, and line number', - args => [label => 'LBL:', 'foo'], + args => [label => 'LBL', 'foo'], file => 'name', lineno => 42, want => "LBL: file name, line 42: > foo\n", }, { desc => 'multiple lines, label, file, and line number', - args => [label => 'LBL:', "foo\nbar"], + args => [label => 'LBL', "foo\nbar"], file => 'name', lineno => 42, want => "LBL: file name, line 42: > foo\nLBL: file name, line 42: bar\n",