Changeset 1937

Timestamp:

04/12/2007 00:07:21 (2 years ago)

Author:

chris

Message:

Make ExtendedLogging? use the logging framework so that we can view
the logs on the console along with other debug output.

Files:

• box/trunk/lib/server/makeprotocol.pl.in (modified) (2 diffs)

box/trunk/lib/server/makeprotocol.pl.in

@@ -504 +504 @@
         if($implement_syslog)
         {
-                my ($format,$args) = make_log_strings($cmd);
+                my ($log) = make_log_strings_framework($cmd);
                 print CPP <<__E;
 void ${class}LogSysLog(const char *Action) const
 {
-        ::syslog(LOG_INFO,"%s $format",Action$args);
+        BOX_TRACE($log);
 }
 __E
@@ -1005 +1005 @@
 }
 
-
+sub make_log_strings_framework
+{
+        my ($cmd) = @_;
+
+        my @args;
+
+        for(my $x = 0; $x < $#{$cmd_contents{$cmd}}; $x+=2)
+        {
+                my ($ty,$nm) = (${$cmd_contents{$cmd}}[$x], ${$cmd_contents{$cmd}}[$x+1]);
+                
+                if(exists $log_display_types{$ty})
+                {
+                        # need to translate it
+                        my ($format,$arg) = @{$log_display_types{$ty}};
+                        $arg =~ s/VAR/m$nm/g;
+
+                        if ($format =~ m'x$')
+                        {
+                                $arg = "std::hex << std::showbase " .
+                                        "<< $arg << std::dec";
+                        }
+
+                        push @args, $arg;
+                }
+                else
+                {
+                        # is opaque
+                        push @args, '"OPAQUE"';
+                }
+        }
+
+        my $log_cmd = "Action << \" $cmd(\" ";
+        foreach my $arg (@args)
+        {
+                $arg = "<< $arg ";
+        }
+        $log_cmd .= join('<< "," ',@args);
+        $log_cmd .= '<< ")"';
+        return $log_cmd;
+}
+
+