X-Git-Url: https://git.llucax.com/z.facultad/75.08/llamadas.git/blobdiff_plain/2ddcc6c972a9879a527b1733e9b1fc2d6eac5aa8..8924bf6b7d40b1b543706926d806e4104db61393:/inst/antifraude.pl

diff --git a/inst/antifraude.pl b/inst/antifraude.pl
index 3e9a9f0..6583252 100644
--- a/inst/antifraude.pl
+++ b/inst/antifraude.pl
@@ -76,18 +76,22 @@ sub logEntry {
 	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);
-	print LOGFILE "$commonstring - $logentry\n";
+	print LOGFILE "$commonstring \"$logentry\"\n";
 	$filesize = tell(LOGFILE);
 	close(LOGFILE);
 
 	# Chequeo el logsize y su lo supero me quedo con 100 lineas
-	if ($filesize > ($CONFDATA{logsize} * 1024 * 1024))
+	if ($filesize > $CONFDATA{logsize})
 	{
 		open(LOGFILE,"+<$log");
 		do ($line = <LOGFILE>) until $. == 100;
@@ -133,13 +137,19 @@ sub checkUmbrales {
 	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;
-		$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";
@@ -173,12 +183,6 @@ open(PARAMFILE,"$CONFDIR/umbrales.param") or die "No se pudo abrir el archivo de
 @UMBRALES = <PARAMFILE>;
 close(PARAMFILE);
 
-# For Debug Only
-print("\nLogdir: $CONFDATA{logdir}\n");
-print("Logfile: $CONFDATA{logfile}\n");
-print("Logsize: $CONFDATA{logsize}\n");
-print("Datadir: $CONFDATA{datadir}\n\n");
-
 # Proceso los archivos de llamadas
 @archivos = getCallFiles();
 FILE: foreach $filename (@archivos) {