From 9c163e57c4e6476bd5d5ad1af55c158e356d45b1 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 20 Feb 2010 03:56:20 +0000 Subject: [PATCH] Simple bugfixes Fixed typo preventing log entries in the email report from being separated onto new lines. Fixed mistake in error messages when HandBrake sockets are closed --- handbrake-cluster-client.pl | 2 +- handbrake-cluster-worker.pl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/handbrake-cluster-client.pl b/handbrake-cluster-client.pl index 7e56635..6680324 100755 --- a/handbrake-cluster-client.pl +++ b/handbrake-cluster-client.pl @@ -173,7 +173,7 @@ sub on_complete_handler { success => $response->{success}, filename => $response->{output_filename}, real_filename => $response->{real_output_filename}, - log => join '\n', @{ $response->{log} }, + log => join "\n", @{ $response->{log} }, }, ); $email->send; diff --git a/handbrake-cluster-worker.pl b/handbrake-cluster-worker.pl index b3c9206..80abf10 100755 --- a/handbrake-cluster-worker.pl +++ b/handbrake-cluster-worker.pl @@ -135,11 +135,11 @@ sub handbrake_rip { foreach my $handle (@ready) { my $bytes_read = sysread($handle, my $buf = '', 1024); if ($bytes_read == -1) { - $log->error("Error reading from HandBrake STDOUT: $!"); + $log->error("Error reading from HandBrake socket: $!"); $select->remove($child_out); next; } elsif ($bytes_read == 0) { - $log->debug("HandBrake STDOUT closed"); + $log->debug("HandBrake socket closed"); $select->remove($handle); next; }