[systemimager-commits] r4103 - branches/3.9.x/sbin

[<ar...@sy...>]

Author: arighi
Date: 2007-08-04 05:30:31 -0500 (Sat, 04 Aug 2007)
New Revision: 4103

Modified:
   branches/3.9.x/sbin/si_monitor
Log:
This commit is a merge from trunk -> 3.9.x:
   svn merge -r 4094:4095 svn://svn.systemimager.org/var/lib/svn/systemimager/trunk .

Original commit message:

Use localtime() instead of gmtime() for timestampping the log -- localtime() is
based on the locale of the system whereas gmtime() is simply the Greenwich
timezone.


Modified: branches/3.9.x/sbin/si_monitor
===================================================================
--- branches/3.9.x/sbin/si_monitor	2007-08-04 10:27:22 UTC (rev 4102)
+++ branches/3.9.x/sbin/si_monitor	2007-08-04 10:30:31 UTC (rev 4103)
@@ -154,11 +154,11 @@
 $SIG{CHLD} = 'IGNORE';
 
 # Create a new process session.
-setsid or die gmtime() . ": error: can't start a new session: $!\n";
+setsid or die localtime() . ": error: can't start a new session: $!\n";
 
 # Create the pid file.
 open(FILE, ">$pid_file") or
-	die gmtime() . ": error: cannot open file: $pid_file\n";
+	die localtime() . ": error: cannot open file: $pid_file\n";
 print FILE "$$\n";
 close(FILE);
 
@@ -182,16 +182,16 @@
 
 # Open a TCP socket.
 socket(IN, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or 
-	die gmtime() . ": error: could not create the socket: $!\n";
+	die localtime() . ": error: could not create the socket: $!\n";
 setsockopt(IN, SOL_SOCKET, SO_REUSEADDR, 1);
 my $client_addr = sockaddr_in($port, INADDR_ANY);
 bind(IN, $client_addr) or 
-	die gmtime() . ": error: could not bind to port $port : $!\n";
+	die localtime() . ": error: could not bind to port $port : $!\n";
 listen(IN, SOMAXCONN) or 
-	die gmtime() . ": error: could not listen on port $port : $!\n";
+	die localtime() . ": error: could not listen on port $port : $!\n";
 
 # Monitor daemon initialized.
-print gmtime() . ": $program_name daemon is listening on port $port\n"
+print localtime() . ": $program_name daemon is listening on port $port\n"
 	if ($log_level > 2);
 
 # Begin to accept client connections.
@@ -209,7 +209,7 @@
 		my $other_host = gethostbyaddr($other_iaddr, AF_INET);
 	
 		# Report info in the log.
-		print gmtime() .
+		print localtime() .
 			": connection accepted for ${other_host}:${other_port}\n"
 			if ($log_level > 2);
 	
@@ -217,14 +217,14 @@
 		$_ = <CLIENT>; chomp;
 
 		# Report the request in the log.
-		print gmtime() . ": ${other_host} request -> $_\n"
+		print localtime() . ": ${other_host} request -> $_\n"
 			if ($log_level > 2);
 
 		# Update the database.
 		update_db($other_host, $_);
 	} else {
 		# Refuse the client connection.
-		print gmtime() . 
+		print localtime() . 
 			": warning: could not identify other end of a client request, ignoring.\n"
 			if ($log_level > 1);
 	}
@@ -232,7 +232,7 @@
 }
 
 # Error accepting client connections (quit).
-die gmtime() . ": error: cannot accept clients connections!\n";
+die localtime() . ": error: cannot accept clients connections!\n";
 
 # Usage:
 # $data = get_xml_data();
@@ -264,12 +264,12 @@
 	my $db;
 
 	open(LOCK, ">", "$lock_file") or 
-		die gmtime() . ":error: cannot open lock file \"$lock_file\"!\n";
+		die localtime() . ":error: cannot open lock file \"$lock_file\"!\n";
 	flock(LOCK, LOCK_SH);
 	
 	# Open database in mutual exclusion.
 	open(DB, '<', $database) or 
-		die gmtime() . ": error: cannot open \"$database\" for reading!\n";
+		die localtime() . ": error: cannot open \"$database\" for reading!\n";
 	# Parse XML database.
 	if (-s $database) {
 		foreach (<DB>) {
@@ -295,11 +295,11 @@
 	return unless ($out);
 
 	open(LOCK, ">", "$lock_file") or 
-		die gmtime() . ":error: cannot open lock file \"$lock_file\"!\n";
+		die localtime() . ":error: cannot open lock file \"$lock_file\"!\n";
 	flock(LOCK, LOCK_SH);
 
 	open(DB, '>', $database) or
-		die gmtime() . ": error: cannot open \"$database\" for writing!\n";
+		die localtime() . ": error: cannot open \"$database\" for writing!\n";
 	
 	# Sync the database.
 	print DB $out; 
@@ -361,7 +361,7 @@
 
 	# Check if mac address has been specified.
 	unless(defined($mac)) {
-		print gmtime() . ": warning: bad request from $host (mac address not specified)!\n"
+		print localtime() . ": warning: bad request from $host (mac address not specified)!\n"
 			if ($log_level > 1);
 		return;
 	}