Changeset 2172

Timestamp:

28/05/2008 13:33:42 (4 years ago)

Author:

chris

Message:

Add a GetMessage?() method to Protocol objects to return a stringified
message as a string.

Fix a typo in a comment.

File:

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

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

@@ -179 +179 @@
 
 #include "Box.h"
+
+#include <sstream>
+
 #include "$h_filename"
 #include "IOStream.h"
@@ -274 +277 @@
 if($derive_objects_from ne 'ProtocolObject')
 {       
-        # output a definition for the protocol object derviced class
+        # output a definition for the protocol object derived class
         print H <<__E;
 class ${protocol_name}ProtocolServer;
@@ -339 +342 @@
         {
                 print H "\tbool IsError(int &rTypeOut, int &rSubTypeOut) const;\n";
+                print H "\tstd::string GetMessage() const;\n";
         }
         if($type eq 'Server' && obj_is_type($cmd, 'Command'))
@@ -498 +502 @@
         rSubTypeOut = m$mem_subtype;
         return true;
+}
+std::string ${class}GetMessage() const
+{
+        switch(m$mem_subtype)
+        {
+__E
+                foreach my $const (@{$cmd_constants{$cmd}})
+                {
+                        next unless $const =~ /^Err_(.*)/;
+                        my $shortname = $1;
+                        $const =~ s/ = .*//;
+                        print CPP <<__E;
+                case $const: return "$shortname";
+__E
+                }
+                print CPP <<__E;
+                default:
+                        std::ostringstream out;
+                        out << "Unknown subtype " << m$mem_subtype;
+                        return out.str();
+        }
 }
 __E
@@ -891 +916 @@
                 {
                         SetError(type, subType);
-                        BOX_WARNING("Protocol: Received error " << type <<
-                                "/" << subType);
+                        BOX_WARNING("$cmd command failed: received error " <<
+                                ((${classname_base}Error&)*preply).GetMessage());
                 }
                 else
                 {
                         SetError(Protocol::UnknownError, Protocol::UnknownError);
-                        BOX_WARNING("Protocol: Received unknown error");
+                        BOX_WARNING("$cmd command failed: received "
+                                "unexpected response type " <<
+                                preply->GetType());
                 }