[1/5] testbot: Always prefix log messages with the name of the current tool.
Francois Gouget
fgouget at codeweavers.com
Wed Oct 24 05:15:17 CDT 2012
Simplify the log messages accordingly and standardize them a bit.
---
testbot/bin/CheckForWinetestUpdate.pl | 15 ++++----
testbot/bin/Engine.pl | 62 ++++++++++++++++-----------------
testbot/bin/Janitor.pl | 16 ++++-----
testbot/bin/RevertVM.pl | 8 ++---
testbot/bin/WinePatchesWebGet.pl | 7 ++--
testbot/bin/WineRunBuild.pl | 6 ++--
testbot/bin/WineRunReconfig.pl | 6 ++--
testbot/bin/WineRunTask.pl | 10 +++---
testbot/bin/WineSendLog.pl | 10 +++---
testbot/lib/WineTestBot/Log.pm | 9 +++--
10 files changed, 75 insertions(+), 74 deletions(-)
diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl
index 039c4d4..de8befb 100755
--- a/testbot/bin/CheckForWinetestUpdate.pl
+++ b/testbot/bin/CheckForWinetestUpdate.pl
@@ -102,7 +102,7 @@ sub AddJob
(my $ErrKey, my $ErrProperty, my $ErrMessage) = $Jobs->Save();
if (defined($ErrMessage))
{
- LogMsg "CheckForWinetestUpdate: Failed to save job: $ErrMessage\n";
+ LogMsg "Failed to save job: $ErrMessage\n";
exit 1;
}
@@ -142,7 +142,7 @@ sub AddReconfigJob
my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
if (defined($ErrMessage))
{
- LogMsg "CheckForWinetestUpdate: Failed to save reconfig job: $ErrMessage\n";
+ LogMsg "Failed to save reconfig job: $ErrMessage\n";
exit 1;
}
}
@@ -194,8 +194,7 @@ if ($Response->code != RC_OK)
{
if ($Response->code != RC_NOT_MODIFIED)
{
- LogMsg "CheckForWinetestUpdate: Unexpected HTTP response code ",
- $Response->code, "\n";
+ LogMsg "Unexpected HTTP response code ", $Response->code, "\n";
exit 1;
}
exit;
@@ -204,7 +203,7 @@ if ($Response->code != RC_OK)
my $NewFile = 1;
if (! open STAGINGFILE, ">$StagingFileName")
{
- LogMsg "CheckForWinetestUpdate: can't create staging file $StagingFileName: $!\n";
+ LogMsg "Can't create staging file $StagingFileName: $!\n";
exit 1;
}
print STAGINGFILE $Response->decoded_content();
@@ -220,7 +219,7 @@ if (! $NewFile)
}
if (! copy($StagingFileName, $LatestFileName))
{
- LogMsg "CheckForWinetestUpdate: Can't copy $StagingFileName to $LatestFileName: $!\n";
+ LogMsg "Can't copy $StagingFileName to $LatestFileName: $!\n";
}
utime time, $Response->last_modified, $LatestFileName;
@@ -237,7 +236,7 @@ if ($Bits == 32)
$StagingFileName = "$DataDir/staging/${FileNameRandomPart}_winetest-latest.exe";
if (! copy($LatestFileName, $StagingFileName))
{
- LogMsg "CheckForWinetestUpdate: Can't copy $LatestFileName to $StagingFileName: $!\n";
+ LogMsg "Can't copy $LatestFileName to $StagingFileName: $!\n";
}
else
{
@@ -251,6 +250,6 @@ else
FoundWinetestUpdate($Bits);
-LogMsg "CheckForWinetestUpdate: submitted jobs\n";
+LogMsg "Submitted jobs\n";
exit;
diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index b97402b..d504a50 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -45,8 +45,8 @@ use WineTestBot::VMs;
sub FatalError
{
- LogMsg "Engine: ", @_;
- LogMsg "Engine: WineTestBot Engine shutdown caused by a fatal error\n";
+ LogMsg @_;
+ LogMsg "Shutdown following a fatal error\n";
exit 1;
}
@@ -64,7 +64,7 @@ sub HandleJobSubmit
my $Job = $Jobs->GetItem($JobKey);
if (! $Job)
{
- LogMsg "Engine: JobSubmit for nonexistent job $JobKey\n";
+ LogMsg "JobSubmit for nonexistent job $JobKey\n";
return "0Job $JobKey not found";
}
# We've already determined that JobKey is valid, untaint it
@@ -79,14 +79,14 @@ sub HandleJobSubmit
$ErrMessage = $Step->HandleStaging($JobKey);
if (defined($ErrMessage))
{
- LogMsg "Engine: staging problem: $ErrMessage\n";
+ LogMsg "Staging problem: $ErrMessage\n";
}
}
$ErrMessage = $Jobs->Schedule();
if (defined($ErrMessage))
{
- LogMsg "Engine: schedule problem: $ErrMessage\n";
+ LogMsg "Scheduling problem in HandleJobSubmit: $ErrMessage\n";
}
return "1OK";
@@ -98,7 +98,7 @@ sub HandleJobStatusChange
if (! defined($OldStatus) || ! defined($NewStatus))
{
- LogMsg "Engine: invalid status in jobstatuschange message\n";
+ LogMsg "Invalid status in jobstatuschange message\n";
return "0Invalid status";
}
@@ -109,7 +109,7 @@ sub HandleJobStatusChange
}
else
{
- LogMsg "Engine: Invalid JobKey $JobKey in jobstatuschange message\n";
+ LogMsg "Invalid JobKey $JobKey in jobstatuschange message\n";
}
if ($OldStatus eq "running" && $NewStatus ne "running")
@@ -122,12 +122,12 @@ sub HandleJobStatusChange
}
if (defined($Pid) && ! $Pid)
{
- LogMsg "Engine: Unable to exec ${ProjectName}SendLog.pl : $!\n";
+ LogMsg "Unable to exec ${ProjectName}SendLog.pl : $!\n";
exit;
}
if (! defined($Pid))
{
- LogMsg "Engine: Unable to fork for ${ProjectName}SendLog.pl : $!\n";
+ LogMsg "Unable to fork for ${ProjectName}SendLog.pl : $!\n";
}
}
@@ -141,7 +141,7 @@ sub HandleJobCancel
my $Job = CreateJobs()->GetItem($JobKey);
if (! $Job)
{
- LogMsg "Engine: JobCancel for nonexistent job $JobKey\n";
+ LogMsg "JobCancel for nonexistent job $JobKey\n";
return "0Job $JobKey not found";
}
# We've already determined that JobKey is valid, untaint it
@@ -151,7 +151,7 @@ sub HandleJobCancel
my $ErrMessage = $Job->Cancel();
if (defined($ErrMessage))
{
- LogMsg "Engine: cancel problem: $ErrMessage\n";
+ LogMsg "Cancel problem: $ErrMessage\n";
return "0$ErrMessage";
}
@@ -163,7 +163,7 @@ sub HandleTaskComplete
my $ErrMessage = CreateJobs()->Schedule();
if (defined($ErrMessage))
{
- LogMsg "Engine: schedule problem in HandleTaskComplete: $ErrMessage\n";
+ LogMsg "Scheduling problem in HandleTaskComplete: $ErrMessage\n";
}
return "1OK";
@@ -175,7 +175,7 @@ sub HandleVMStatusChange
if (! defined($OldStatus) || ! defined($NewStatus))
{
- LogMsg "Engine: invalid status in vmstatuschange message\n";
+ LogMsg "Invalid status in vmstatuschange message\n";
return "0Invalid status";
}
@@ -185,7 +185,7 @@ sub HandleVMStatusChange
my $ErrMessage = CreateJobs()->Schedule();
if (defined($ErrMessage))
{
- LogMsg "Engine: schedule problem in HandleVMStatusChange: $ErrMessage\n";
+ LogMsg "Scheduling problem in HandleVMStatusChange: $ErrMessage\n";
return "0$ErrMessage";
}
}
@@ -205,12 +205,12 @@ sub CheckForWinetestUpdate
}
if (defined($Pid) && ! $Pid)
{
- LogMsg "Engine: Unable to exec CheckForWinetestUpdate.pl : $!\n";
+ LogMsg "Unable to exec CheckForWinetestUpdate.pl : $!\n";
exit;
}
if (! defined($Pid))
{
- LogMsg "Engine: Unable to fork for CheckForWinetestUpdate.pl : $!\n";
+ LogMsg "Unable to fork for CheckForWinetestUpdate.pl : $!\n";
}
}
@@ -228,7 +228,7 @@ sub GiveUpOnWinetestUpdate
{
DeleteEvent("CheckForWinetestUpdate32");
DeleteEvent("CheckForWinetestUpdate64");
- LogMsg "Engine: Giving up on winetest.exe update\n";
+ LogMsg "Giving up on winetest.exe update\n";
}
sub HandleExpectWinetestUpdate
@@ -257,7 +257,7 @@ sub HandleFoundWinetestUpdate
}
else
{
- LogMsg "Engine: invalid number of bits in foundwinetestupdate message\n";
+ LogMsg "Invalid number of bits in foundwinetestupdate message\n";
return "0Invalid number of bits";
}
@@ -271,7 +271,7 @@ sub HandleFoundWinetestUpdate
my $ErrMessage = CreateJobs()->Schedule();
if (defined($ErrMessage))
{
- LogMsg "Engine: schedule problem in HandleFoundWinetestUpdate: $ErrMessage\n";
+ LogMsg "Scheduling problem in HandleFoundWinetestUpdate: $ErrMessage\n";
}
return "1OK";
@@ -358,12 +358,12 @@ sub HandleWinePatchWebNotification
}
if (defined($Pid) && ! $Pid)
{
- LogMsg "Engine: Unable to exec WinePatchesWebGet.pl : $!\n";
+ LogMsg "Unable to exec WinePatchesWebGet.pl : $!\n";
exit;
}
if (! defined($Pid))
{
- LogMsg "Engine: Unable to fork for WinePatchesWebGet.pl : $!\n";
+ LogMsg "Unable to fork for WinePatchesWebGet.pl : $!\n";
}
}
@@ -387,7 +387,7 @@ sub HandleWinePatchWebSubmission
$Patches->AddFilter("WebPatchId", [$WebPatchId]);
if (@{$Patches->GetKeys()})
{
- LogMsg "Engine: patch $WebPatchId already exists\n";
+ LogMsg "Patch $WebPatchId already exists\n";
return "1OK";
}
@@ -417,7 +417,7 @@ sub HandleGetScreenshot
# Validate VM name
if ($_[0] !~ m/^(\w+)$/)
{
- LogMsg "Engine: GetScreenshot: invalid VM name\n";
+ LogMsg "Invalid VM name for screenshot\n";
return "0Invalid VM name";
}
my $VMName = $1;
@@ -426,14 +426,14 @@ sub HandleGetScreenshot
my $VM = $VMs->GetItem($VMName);
if (! defined($VM))
{
- LogMsg "Engine: GetScreenshot: unknown VM $VMName\n";
+ LogMsg "Unknown VM $VMName for screenshot\n";
return "0Unknown VM $VMName";
}
my ($ErrMessage, $ImageSize, $ImageBytes) = $VM->CaptureScreenImage();
if (defined($ErrMessage))
{
- LogMsg "Engine: GetScreenshot: $ErrMessage\n";
+ LogMsg "Screenshot failed: $ErrMessage\n";
return "0$ErrMessage";
}
@@ -492,7 +492,7 @@ sub HandleClientCmd
return HandleGetScreenshot(@_);
}
- LogMsg "Engine: Unknown command $Cmd\n";
+ LogMsg "Unknown command $Cmd\n";
return "0Unknown command $Cmd\n";
}
@@ -575,7 +575,7 @@ sub SafetyNet
my $ErrMessage = $Set->CheckForCompleteSet();
if (defined($ErrMessage))
{
- LogMsg "Engine: while checking completeness of patch series: $ErrMessage\n";
+ LogMsg "Failed to check completeness of patch series: $ErrMessage\n";
}
}
@@ -639,7 +639,7 @@ sub main
$SIG{CHLD} = \&REAPER;
$WineTestBot::Engine::Notify::RunningInEngine = 1;
- LogMsg "Engine: Starting the WineTestBot Engine\n";
+ LogMsg "Starting the WineTestBot Engine\n";
InitVMs();
@@ -706,7 +706,7 @@ sub main
}
elsif ($! != EAGAIN)
{
- LogMsg "Engine: socket accept failed: $!\n";
+ LogMsg "Socket accept failed: $!\n";
}
}
@@ -732,7 +732,7 @@ sub main
length($Client->{OutBuf}));
if (! defined($Len))
{
- LogMsg "Engine: Error writing reply to client: $!\n";
+ LogMsg "Error writing reply to client: $!\n";
$NeedClose = 1;
}
else
@@ -761,7 +761,7 @@ sub main
}
}
- LogMsg "Engine: Normal WineTestBot Engine shutdown\n";
+ LogMsg "Normal WineTestBot Engine shutdown\n";
return 0;
}
diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index 5f3a992..6ae3c8f 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -50,12 +50,12 @@ if ($WineTestBot::Config::JobPurgeDays != 0)
my $Job = $Jobs->GetItem($JobKey);
if (defined($Job->Ended) && $Job->Ended < $DeleteBefore)
{
- LogMsg "Janitor: deleting job ", $Job->Id, "\n";
+ LogMsg "Deleting job ", $Job->Id, "\n";
system "rm", "-rf", "$DataDir/jobs/" . $Job->Id;
my $ErrMessage = $Jobs->DeleteItem($Job);
if (defined($ErrMessage))
{
- LogMsg "Janitor: ", $ErrMessage, "\n";
+ LogMsg $ErrMessage, "\n";
}
}
}
@@ -82,7 +82,7 @@ foreach my $SetKey (@{$Sets->GetKeys()})
if (! defined($MostRecentPatch) ||
$MostRecentPatch->Received < $DeleteBefore)
{
- LogMsg "Janitor: deleting pending series for ", $Set->EMail, "\n";
+ LogMsg "Deleting pending series for ", $Set->EMail, "\n";
$Sets->DeleteItem($Set);
$MostRecentPatch->Disposition("Incomplete series, discarded");
$MostRecentPatch->Save();
@@ -103,12 +103,12 @@ if ($WineTestBot::Config::JobPurgeDays != 0)
$Jobs->AddFilter("Patch", [$Patch]);
if ($Jobs->IsEmpty())
{
- LogMsg "Janitor: deleting patch ", $Patch->Id, "\n";
+ LogMsg "Deleting patch ", $Patch->Id, "\n";
unlink("$DataDir/patches/" . $Patch->Id);
my $ErrMessage = $Patches->DeleteItem($Patch);
if (defined($ErrMessage))
{
- LogMsg "Janitor: ", $ErrMessage, "\n";
+ LogMsg $ErrMessage, "\n";
}
}
}
@@ -127,7 +127,7 @@ if ($WineTestBot::Config::JobArchiveDays != 0)
my $Job = $Jobs->GetItem($JobKey);
if (defined($Job->Ended) && $Job->Ended < $ArchiveBefore)
{
- LogMsg "Janitor: archiving job ", $Job->Id, "\n";
+ LogMsg "Archiving job ", $Job->Id, "\n";
my $Steps = $Job->Steps;
foreach my $StepKey (@{$Steps->GetKeys()})
@@ -166,7 +166,7 @@ if (%DeleteList)
my $Task = $Tasks->GetItem($TaskKey);
if (exists $DeleteList{$Task->VM->Name})
{
- LogMsg "Janitor: keeping the ", $Task->VM->Name, " VM for task (", join(":", $JobKey, $StepKey, $TaskKey), ")\n";
+ LogMsg "Keeping the ", $Task->VM->Name, " VM for task (", join(":", $JobKey, $StepKey, $TaskKey), ")\n";
delete $DeleteList{$Task->VM->Name};
}
}
@@ -178,7 +178,7 @@ if (%DeleteList)
my $ErrMessage = $VMs->DeleteItem($VM);
if (!defined $ErrMessage)
{
- LogMsg "Janitor: deleted the ", $VM->Name, " VM\n";
+ LogMsg "Deleted the ", $VM->Name, " VM\n";
}
}
}
diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl
index c62d498..d7b262e 100755
--- a/testbot/bin/RevertVM.pl
+++ b/testbot/bin/RevertVM.pl
@@ -41,7 +41,7 @@ sub FatalError
my $VMKey = defined($VM) ? $VM->GetKey() : "";
- LogMsg "RevertVM: $VMKey $ErrMessage\n";
+ LogMsg $ErrMessage, "\n";
if ($VM)
{
@@ -71,7 +71,7 @@ if (! $VMKey)
die "Usage: RevertVM.pl VMName";
}
-LogMsg "RevertVM: revert of $VMKey started\n";
+LogMsg "Revert of $VMKey started\n";
my $VMs = CreateVMs();
my $VM = $VMs->GetItem($VMKey);
@@ -111,7 +111,7 @@ foreach my $WaitCount (1..3)
}
if (defined($ErrMessage))
{
- LogMsg "RevertVM: $VMKey Error while waiting for tools: $ErrMessage\n";
+ LogMsg "$VMKey Error while waiting for tools: $ErrMessage\n";
}
if ($SleepAfterRevert != 0)
@@ -126,6 +126,6 @@ if (defined($ErrMessage))
FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM;
}
-LogMsg "RevertVM: revert of $VMKey completed\n";
+LogMsg "Revert of $VMKey completed\n";
exit;
diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl
index d1bcd4b..d6b3f2b 100755
--- a/testbot/bin/WinePatchesWebGet.pl
+++ b/testbot/bin/WinePatchesWebGet.pl
@@ -76,8 +76,7 @@ foreach my $WebPatchId ($StartWebPatchId..$EndWebPatchId)
my $Response = $UA->request($Request);
if ($Response->code != RC_OK)
{
- LogMsg "WinePatchesWebGet: Unexpected HTTP response code ",
- $Response->code, "\n";
+ LogMsg "Unexpected HTTP response code ", $Response->code, "\n";
exit 1;
}
my $FileNameRandomPart = GenerateRandomString(32);
@@ -88,7 +87,7 @@ foreach my $WebPatchId ($StartWebPatchId..$EndWebPatchId)
my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$WebPatchId";
if (! open STAGINGFILE, ">$StagingFileName")
{
- LogMsg "WinePatchesWebGet: can't create staging file $StagingFileName: $!\n";
+ LogMsg "Can't create staging file $StagingFileName: $!\n";
exit 1;
}
print STAGINGFILE $Response->decoded_content();
@@ -96,7 +95,7 @@ foreach my $WebPatchId ($StartWebPatchId..$EndWebPatchId)
WinePatchWebSubmission("${FileNameRandomPart}_patch_$WebPatchId", $WebPatchId);
- LogMsg "WinePatchesWebGet: retrieved patch $WebPatchId\n";
+ LogMsg "Retrieved patch $WebPatchId\n";
}
exit;
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 5c8a7ef..86f03c7 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -43,7 +43,7 @@ sub FatalError
my $StepKey = defined($Step) ? $Step->GetKey() : "0";
my $TaskKey = defined($Task) ? $Task->GetKey() : "0";
- LogMsg "WineRunBuild: $JobKey/$StepKey/$TaskKey $ErrMessage";
+ LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage";
if ($Task)
{
@@ -179,7 +179,7 @@ mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo";
my $VM = $Task->VM;
-LogMsg "WineRunBuild: task $JobId/$StepNo/$TaskNo started\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo started\n";
my $RptFileName = $VM->Name . ".rpt";
my $StepDir = "$DataDir/jobs/$JobId/$StepNo";
@@ -316,6 +316,6 @@ $Jobs = undef;
TaskComplete($JobId, $StepNo, $TaskNo);
-LogMsg "WineRunBuild: task $JobId/$StepNo/$TaskNo completed\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo completed\n";
exit;
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 2d8618e..89fe3da 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -43,7 +43,7 @@ sub FatalError
my $StepKey = defined($Step) ? $Step->GetKey() : "0";
my $TaskKey = defined($Task) ? $Task->GetKey() : "0";
- LogMsg "WineRunReconfig: $JobKey/$StepKey/$TaskKey $ErrMessage";
+ LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage";
if ($Task)
{
@@ -179,7 +179,7 @@ mkdir "$DataDir/jobs/$JobId/$StepNo/$TaskNo";
my $VM = $Task->VM;
-LogMsg "WineRunReconfig: task $JobId/$StepNo/$TaskNo started\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo started\n";
my $StepDir = "$DataDir/jobs/$JobId/$StepNo";
my $TaskDir = "$StepDir/$TaskNo";
@@ -253,6 +253,6 @@ $Jobs = undef;
TaskComplete($JobId, $StepNo, $TaskNo);
-LogMsg "WineRunReconfig: task $JobId/$StepNo/$TaskNo completed\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo completed\n";
exit;
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index ca72fc7..bfbffe8 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -43,7 +43,7 @@ sub FatalError
my $StepKey = defined($Step) ? $Step->GetKey() : "0";
my $TaskKey = defined($Task) ? $Task->GetKey() : "0";
- LogMsg "WineRunTask: $JobKey/$StepKey/$TaskKey $ErrMessage";
+ LogMsg "$JobKey/$StepKey/$TaskKey $ErrMessage";
if ($Task)
{
@@ -99,12 +99,12 @@ sub TakeScreenshot
}
else
{
- LogMsg "WineRunTask: Can't save screenshot: $!\n";
+ LogMsg "Can't save screenshot: $!\n";
}
}
else
{
- LogMsg "WineRunTask: Can't capture screenshot: $ErrMessage\n";
+ LogMsg "Can't capture screenshot: $ErrMessage\n";
}
}
@@ -219,7 +219,7 @@ umask($oldumask);
my $VM = $Task->VM;
-LogMsg "WineRunTask: task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") started\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") started\n";
my $RptFileName = $VM->Name . ".rpt";
my $StepDir = "$DataDir/jobs/$JobId/$StepNo";
@@ -363,6 +363,6 @@ $Jobs = undef;
TaskComplete($JobId, $StepNo, $TaskNo);
-LogMsg "WineRunTask: task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n";
+LogMsg "Task $JobId/$StepNo/$TaskNo (" . $VM->Name . ") completed\n";
exit;
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index bc0e72b..95814fe 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -41,7 +41,7 @@ sub FatalError
my $JobKey = defined($Job) ? $Job->GetKey() : "0";
- LogMsg "WineSendLog: $JobKey $ErrMessage";
+ LogMsg "$JobKey $ErrMessage";
exit 1;
}
@@ -125,7 +125,7 @@ sub ReadLog
}
else
{
- LogMsg "WineSendLog: Unable to open log $LogName\n";
+ LogMsg "Unable to open log $LogName\n";
}
return \@Messages;
@@ -401,7 +401,7 @@ EOF
}
else
{
- LogMsg "WineSendLog: BotFailure found in ${LatestName}.err\n";
+ LogMsg "BotFailure found in ${LatestName}.err\n";
}
if ($MessagesFromErr || $MessagesFromLog)
{
@@ -411,7 +411,7 @@ EOF
}
elsif ($BotFailure)
{
- LogMsg "WineSendLog: BotFailure found in $TaskDir/err\n";
+ LogMsg "BotFailure found in $TaskDir/err\n";
}
}
@@ -532,6 +532,6 @@ if (! defined($Job))
SendLog($Job);
-LogMsg "WineSendLog: log for job $JobId sent\n";
+LogMsg "Log for job $JobId sent\n";
exit;
diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm
index 7de6dcb..102b74d 100644
--- a/testbot/lib/WineTestBot/Log.pm
+++ b/testbot/lib/WineTestBot/Log.pm
@@ -33,15 +33,18 @@ require Exporter;
@EXPORT = qw(&LogMsg);
my $logfile;
+my $logprefix;
sub LogMsg(@)
{
if (!defined $logfile)
{
+ require File::Basename;
+ $logprefix = File::Basename::basename($0);
+ $logprefix =~ s/\.[^.]*$//;
my $oldumask = umask(002);
if (!open($logfile, ">>", "$LogDir/log"))
{
- require File::Basename;
- print STDERR File::Basename::basename($0), ":warning: could not open '$LogDir/log' for writing: $!\n";
+ print STDERR "$logprefix:warning: could not open '$LogDir/log' for writing: $!\n";
open($logfile, ">>&=", 2);
}
umask($oldumask);
@@ -51,7 +54,7 @@ sub LogMsg(@)
$| = 1;
select($tmp);
}
- print $logfile scalar localtime, " ", @_ if ($logfile);
+ print $logfile scalar localtime, " ", $logprefix, ": ", @_ if ($logfile);
}
1;
--
1.7.10.4
More information about the wine-patches
mailing list