Matthias Julius <[EMAIL PROTECTED]> writes:
> I have prepared another little patch ...
Well, here is the patch...
Matthias
Index: tilesGen.pl
===================================================================
--- tilesGen.pl (revision 9229)
+++ tilesGen.pl (working copy)
@@ -582,12 +582,12 @@
my ($runNumber) = @_;
- keepLog($PID,"compress","start","$runNumber $progressJobs") if $Config->get("ProcessLog");
+ keepLog($PID,"compress","start","$runNumber $progressJobs");
my $CompressScript = "perl $Bin/compress.pl $runNumber $progressJobs";
my $retval = system($CompressScript);
- keepLog($PID,"compress","stop","return=$retval") if $Config->get("ProcessLog");
+ keepLog($PID,"compress","stop","return=$retval");
return $retval;
}
@@ -599,12 +599,12 @@
my ($runNumber) = @_;
- keepLog($PID,"upload","start","$runNumber $progressJobs") if $Config->get("ProcessLog");
+ keepLog($PID,"upload","start","$runNumber $progressJobs");
my $UploadScript = "perl $Bin/upload.pl $runNumber $progressJobs";
my $retval = system($UploadScript);
- keepLog($PID,"upload","stop","return=$retval") if $Config->get("ProcessLog");
+ keepLog($PID,"upload","stop","return=$retval");
return $retval;
}
@@ -799,7 +799,7 @@
{
my ($X, $Y, $Zoom) = @_;
- keepLog($PID,"GenerateTileset","start","x=$X,y=$Y,z=$Zoom for layers $Layers") if $Config->get("ProcessLog");
+ keepLog($PID,"GenerateTileset","start","x=$X,y=$Y,z=$Zoom for layers $Layers");
my ($N, $S) = Project($Y, $Zoom);
my ($W, $E) = ProjectL($X, $Zoom);
@@ -1217,7 +1217,7 @@
foreach my $file(@tempfiles) { killafile($file) if (!$Config->get("Debug")); }
- keepLog($PID,"GenerateTileset","stop","x=$X,y=$Y,z=$Zoom for layers $Layers") if $Config->get("ProcessLog");
+ keepLog($PID,"GenerateTileset","stop","x=$X,y=$Y,z=$Zoom for layers $Layers");
return 1;
}
Index: tahlib.pm
===================================================================
--- tahlib.pm (revision 9229)
+++ tahlib.pm (working copy)
@@ -1,4 +1,5 @@
use strict;
+use tahconfig;
# =====================================================================
# The following is duplicated from tilesGen.pl
@@ -374,14 +375,18 @@
sub keepLog
{
- my ($Pid,$Process,$Action,$Message) = @_;
my $Config = $main::Config;
- my $logFile = $Config->get("ProcessLogFile");
-
- open(my $fpLog, ">>$logFile");
- if ($fpLog) {
- print $fpLog time()." [".$Config->get("ClientVersion")."] $Pid $Process $Action $Message\n";
- close $fpLog;
+ if ($Config->get("ProcessLog")) {
+ my ($Pid,$Process,$Action,$Message) = @_;
+ my $logFile = $Config->get("ProcessLogFile");
+ my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime();
+ $year += 1900;
+
+ open(my $fpLog, ">>$logFile");
+ if ($fpLog) {
+ print $fpLog sprintf("%04d-%02d-%02d %02d:%02d:%02d [%s] %s %s %s %s\n", $year, $mon, $mday, $hour, $min, $sec, $Config->get("ClientVersion"), $Pid, $Process, $Action, $Message);
+ close $fpLog;
+ }
}
}
_______________________________________________
Tilesathome mailing list
[email protected]
http://lists.openstreetmap.org/cgi-bin/mailman/listinfo/tilesathome
