[pve-devel] r6042 - in pve-cluster/trunk/data: perl src

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-05-30 12:27:35 +0200 (Mon, 30 May 2011)
New Revision: 6042

Modified:
   pve-cluster/trunk/data/perl/test1.pl
   pve-cluster/trunk/data/src/logger.c
Log:
include unique id


Modified: pve-cluster/trunk/data/perl/test1.pl
===================================================================
--- pve-cluster/trunk/data/perl/test1.pl	2011-05-30 08:56:24 UTC (rev 6041)
+++ pve-cluster/trunk/data/perl/test1.pl	2011-05-30 10:27:35 UTC (rev 6042)
@@ -9,9 +9,10 @@
 
 
 my $nodename = PVE::INotify::nodename();
-#PVE::Cluster::log_msg(1, "ident2", "msg1 öäü");
+PVE::Cluster::log_msg(1, "ident2", "msg1 öäü");
+PVE::Cluster::log_msg(1, "root\@pam", "msg1 öäü");
 #print PVE::Cluster::get_system_log(undef, 0);
-#exit 0;
+exit 0;
 
 #print PVE::Cluster::get_system_log(undef, 0);
 

Modified: pve-cluster/trunk/data/src/logger.c
===================================================================
--- pve-cluster/trunk/data/src/logger.c	2011-05-30 08:56:24 UTC (rev 6041)
+++ pve-cluster/trunk/data/src/logger.c	2011-05-30 10:27:35 UTC (rev 6042)
@@ -180,9 +180,9 @@
 		if (count)
 			g_string_append_printf(str, ",\n");
 
-		g_string_append_printf(str, "{\"time\": %u, \"pri\": %d, \"tag\": \"%s\", "
+		g_string_append_printf(str, "{\"id\": %u, \"time\": %u, \"pri\": %d, \"tag\": \"%s\", "
 				       "\"pid\": %u, \"node\": \"%s\", \"user\": \"%s\", "
-				       "\"msg\": \"%s\"}", cur->time, cur->priority, tag, 
+				       "\"msg\": \"%s\"}", cur->uid, cur->time, cur->priority, tag, 
 				       cur->pid, node, ident, msg);
 		
 		count++;