Changeset 2084

Timestamp:

31/01/2008 23:55:37 (11 months ago)

Author:

chris

Message:

Use logging framework for streaming messages.

Fix double logging of protocol commands on the server side.

Log protocol errors at WARNING level.

Fix typos in comments and variable names.

Files:

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

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

@@ -621 +621 @@
 __E
 
-my $construtor_extra = '';
-$construtor_extra .= ', mLogToSysLog(false)' if $implement_syslog;
-$construtor_extra .= ', mLogToFile(0)' if $implement_filelog;
+my $constructor_extra = '';
+$constructor_extra .= ', mLogToSysLog(false)' if $implement_syslog;
+$constructor_extra .= ', mLogToFile(0)' if $implement_filelog;
 
 my $destructor_extra = ($type eq 'Server')?"\n\tDeleteStreamsToSend();":'';
@@ -630 +630 @@
 print CPP <<__E;
 $prefix$classname_base(IOStream &rStream)
-        : Protocol(rStream)$construtor_extra
+        : Protocol(rStream)$constructor_extra
 {
 }
@@ -662 +662 @@
 }
 __E
-# write receieve and send functions
+# write receive and send functions
 print CPP <<__E;
 std::auto_ptr<$derive_objects_from> ${prefix}Receive()
@@ -735 +735 @@
                 std::auto_ptr<${derive_objects_from}> pobj(Receive());
 
-__E
-        if($implement_syslog)
-        {
-                print CPP <<__E;
-                if(mLogToSysLog)
-                {
-                        pobj->LogSysLog("Receive");
-                }
-__E
-        }
-        if($implement_filelog)
-        {
-                print CPP <<__E;
-                if(mLogToFile != 0)
-                {
-                        pobj->LogFile("Receive", mLogToFile);
-                }
-__E
-        }
-        print CPP <<__E;
-
                 // Run the command
                 std::auto_ptr<${derive_objects_from}> preply((${derive_objects_from}*)(pobj->DoCommand(*this, rContext).release()));
                 
-__E
-        if($implement_syslog)
-        {
-                print CPP <<__E;
-                if(mLogToSysLog)
-                {
-                        preply->LogSysLog("Send");
-                }
-__E
-        }
-        if($implement_filelog)
-        {
-                print CPP <<__E;
-                if(mLogToFile != 0)
-                {
-                        preply->LogFile("Send", mLogToFile);
-                }
-__E
-        }
-        print CPP <<__E;
-
                 // Send the reply
                 Send(*(preply.get()));
@@ -825 +783 @@
         if($implement_syslog)
         {
-                $fR .= qq~\tif(mLogToSysLog) { ::syslog(LOG_INFO, (Size==Protocol::ProtocolStream_SizeUncertain)?"Receiving stream, size uncertain":"Receiving stream, size %d", Size); }\n~;
-                $fS .= qq~\tif(mLogToSysLog) { ::syslog(LOG_INFO, (Size==Protocol::ProtocolStream_SizeUncertain)?"Sending stream, size uncertain":"Sending stream, size %d", Size); }\n~;
-        }
+                $fR .= <<__E;
+        if(mLogToSysLog)
+        {
+                if(Size==Protocol::ProtocolStream_SizeUncertain)
+                {
+                        BOX_TRACE("Receiving stream, size uncertain");
+                }
+                else
+                {
+                        BOX_TRACE("Receiving stream, size " << Size);
+                }
+        }
+__E
+                
+                $fS .= <<__E;
+        if(mLogToSysLog)
+        {
+                if(Size==Protocol::ProtocolStream_SizeUncertain)
+                {
+                        BOX_TRACE("Sending stream, size uncertain");
+                }
+                else
+                {
+                        BOX_TRACE("Sending stream, size " << Size);
+                }
+        }
+__E
+        }
+
         if($implement_filelog)
         {
-                $fR .= qq~\tif(mLogToFile) { ::fprintf(mLogToFile, (Size==Protocol::ProtocolStream_SizeUncertain)?"Receiving stream, size uncertain\\n":"Receiving stream, size %d\\n", Size); ::fflush(mLogToFile); }\n~;
-                $fS .= qq~\tif(mLogToFile) { ::fprintf(mLogToFile, (Size==Protocol::ProtocolStream_SizeUncertain)?"Sending stream, size uncertain\\n":"Sending stream, size %d\\n", Size); ::fflush(mLogToFile); }\n~;
+                $fR .= <<__E;
+        if(mLogToFile)
+        {
+                ::fprintf(mLogToFile,
+                        (Size==Protocol::ProtocolStream_SizeUncertain)
+                        ?"Receiving stream, size uncertain\\n"
+                        :"Receiving stream, size %d\\n", Size);
+                ::fflush(mLogToFile);
+        }
+__E
+                $fS .= <<__E;
+        if(mLogToFile)
+        {
+                ::fprintf(mLogToFile,
+                        (Size==Protocol::ProtocolStream_SizeUncertain)
+                        ?"Sending stream, size uncertain\\n"
+                        :"Sending stream, size %d\\n", Size);
+                ::fflush(mLogToFile);
+        }
+__E
         }
 
@@ -889 +891 @@
                 {
                         SetError(type, subType);
-                        TRACE2("Protocol: Error received %d/%d\\n", type, subType);
+                        BOX_WARNING("Protocol: Received error " << type <<
+                                "/" << subType);
                 }
                 else
                 {
                         SetError(Protocol::UnknownError, Protocol::UnknownError);
+                        BOX_WARNING("Protocol: Received unknown error");
                 }