Fix for TIMESTAMP field handling

Cédric RICARD
1 parent 0af19e25
Showing 3 changed files with 4 additions and 4 deletions Show diff stats
calexium_lib/net_services/CXM_generic_client.anubis
calexium_lib/net_services/CXM_generic_protocol.anubis
calexium_lib/web/CXM_multihost_http_server.anubis
@@ -62,7 +62,7 @@ public define Maybe(NetServiceAnswer)
       }
   }.
  
-define Maybe($T)
+public define Maybe($T)
   generic_handler
   (
     MessageQueue            queue,
@@ -131,7 +131,7 @@ define Maybe($T)
             {
               failure     then logger("["+queue.get_name(unique)+"]: requesting service RESULT not found");failure,
               success(result)  then 
-                with timestamp =  if find_string(msg, "TIMESTAMP") is
+                with timestamp =  if find_string(result, "TIMESTAMP") is
                                   {
                                     failure     then logger("["+queue.get_name(unique)+"]: requesting service TIMESTAMP not found"); "",
                                     success(timestamp)  then timestamp
@@ -17,7 +17,7 @@ read calexium_lib/CXM_message_constants.anubis
 public define Int32 _CXM_OK             = 0.
 public define Int32 _CXM_ERROR          = 1.
 public define Int32 _CXM_UNKNOW_CMD     = 2.
-public define Int32 _CXM_UNKNOW_SERVICE = 2.
+public define Int32 _CXM_UNKNOW_SERVICE = 3.
  
 public type ProtocolResult:
   failure,
@@ -2070,7 +2070,7 @@ define One
          with nr = length(ba),                          // get the number of bytes read
          if reliable_write(connection,ba) is 
            {
-             failure then log_journal_msg(desc,"Cannot write into connection.\n"), 
+             failure then log_journal_msg(desc,"Cannot write into connection delirering '"+filename+"' (sent="+sent+"; size="+size+"; current="+nr+").\n"), 
              success(nw) then                                
                send_file_body(desc,connection,file,size,sent+nw,filename) 
            }