Log homogeneo con afimonio y aficonf, plus fix en logeo de fecha

diff --git a/inst/antifraude.pl b/inst/antifraude.pl
index f41ee21efcdc4727fe363b6d77fd885cce0fb82a..6583252cba8982872bf5d5d9448203dbdfc05516 100644 (file)
--- a/inst/antifraude.pl
+++ b/inst/antifraude.pl
@@ -76,13 +76,17 @@ sub logEntry {
        my $log = "$CONFDATA{logdir}/$CONFDATA{logfile}";
        # Fetch date and Format it
        ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
        my $log = "$CONFDATA{logdir}/$CONFDATA{logfile}";
        # Fetch date and Format it
        ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);

-       $year += 1900; $year = sprintf("%02d", $year % 100); ++$mon;
-       $user = getlogin || "Unidentified";
-       $commonstring = "[$mday/$mon/$year $hour:$min:$sec|$user|antifraude]";
+       $mon =~ s/^(\d)$/0$1/;
+       $mday =~ s/^(\d)$/0$1/;
+       $hour =~ s/^(\d)$/0$1/;
+       $min =~ s/^(\d)$/0$1/;
+       $year += 1900; ++$mon;
+       $user = "$ENV{USER}";
+       $commonstring = "$mday/$mon/$year-$hour:$min $user antifraude:";

        # Append to log
        open(LOGFILE,">>$log") or die "No se pudo abrir el archivo de log";
        seek(LOGFILE,0,2);
        # Append to log
        open(LOGFILE,">>$log") or die "No se pudo abrir el archivo de log";
        seek(LOGFILE,0,2);

-       print LOGFILE "$commonstring - $logentry\n";
+       print LOGFILE "$commonstring \"$logentry\"\n";

        $filesize = tell(LOGFILE);
        close(LOGFILE);
 
        $filesize = tell(LOGFILE);
        close(LOGFILE);
 


@@ -133,13 +137,19 @@ sub checkUmbrales {
        if ($matchedUmbral > 0) {
                # Obtengo algunos datos
                ($central = $callsfile) =~ s/^.*\.//;
        if ($matchedUmbral > 0) {
                # Obtengo algunos datos
                ($central = $callsfile) =~ s/^.*\.//;

-               $user = getlogin || 'Unidentified';
+               $user = "$ENV{USER}";

 
                # Fetch date and Format it
                ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
                $year += 1900; ++$mon;
 
                # Fetch date and Format it
                ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
                $year += 1900; ++$mon;

-               $date = "$year$mon$mday";
-               $time = "$hour$min$sec";
+               $mon =~ s/^(\d)$/0$1/;
+               $mday =~ s/^(\d)$/0$1/;
+               $hour =~ s/^(\d)$/0$1/;
+               $min =~ s/^(\d)$/0$1/;
+               $sec =~ s/^(\d)$/0$1/;
+               $user = "$ENV{USER}";
+               $date = "${year}${mon}${mday}";
+               $time = "${hour}${min}${sec}";

 
                # Preparo el registro de alarma
                $alarmEntry = "$callfields[7];$central;$callfields[0];$callfields[1];$regid;$callfields[2];$callfields[3];$user;$date;$time";
 
                # Preparo el registro de alarma
                $alarmEntry = "$callfields[7];$central;$callfields[0];$callfields[1];$regid;$callfields[2];$callfields[3];$user;$date;$time";