Index: /trunk/objectmq/src/omq/client/proxy/Proxymq.java
===================================================================
--- /trunk/objectmq/src/omq/client/proxy/Proxymq.java	(revision 29)
+++ /trunk/objectmq/src/omq/client/proxy/Proxymq.java	(revision 30)
@@ -6,4 +6,5 @@
 import java.lang.reflect.Proxy;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -20,5 +21,4 @@
 import omq.common.message.Request;
 import omq.common.message.Response;
-import omq.common.util.Log;
 import omq.common.util.ParameterQueue;
 import omq.common.util.Serializer;
@@ -98,4 +98,6 @@
 	@Override
 	public Object invoke(Object proxy, Method method, Object[] arguments) throws Throwable {
+		//long timeStart = (new Date()).getTime();
+		
 		// Local methods only
 		String methodName = method.getName();
@@ -119,13 +121,20 @@
 		Request request = createRequest(method, arguments);
 
+		//Log.saveTimeSendRequestLog("Client-time-request", request.getId(), method.getName(), timeStart);
+		
+		Object response = null;
 		// Publish the request
 		if (request.isAsync()) {
 			System.out.println("Publish async request -> " + request.getId());
 			publishAsyncRequest(request);
-			return null;
 		} else {
-			System.out.println("Publish sync request -> " + request.getId());
-			return publishSyncRequest(request, method.getReturnType());
-		}
+			System.out.println("Publish sync request -> " + request.getId());			
+			response = publishSyncRequest(request, method.getReturnType());
+			
+			//long timeEnd = (new Date()).getTime();
+			//Log.saveTimeSendRequestLog("Client-time-response", request.getId(), method.getName(), timeEnd);
+		}
+		
+		return response;
 	}
 
@@ -143,5 +152,5 @@
 		byte[] bytesRequest = Serializer.serialize(request);
 		channel.basicPublish(exchange, routingkey, props, bytesRequest);
-		Log.saveLog("Client-Serialize", bytesRequest);
+		//Log.saveLog("Client-Serialize", bytesRequest);
 	}
 
@@ -213,5 +222,6 @@
 			}
 			resp = Serializer.deserializeResponse(results.get(corrId), type);
-			Log.saveLog("Client-Deserialize", results.get(corrId));
+			//Log.saveLog("Client-Deserialize", results.get(corrId));
+			
 			// Remove and indicate the key exists (a hashmap can contain a null
 			// object, using this we'll know whether a response has been
Index: /trunk/objectmq/src/omq/common/broker/Broker.java
===================================================================
--- /trunk/objectmq/src/omq/common/broker/Broker.java	(revision 29)
+++ /trunk/objectmq/src/omq/common/broker/Broker.java	(revision 30)
@@ -115,5 +115,9 @@
 		System.out.println("EventTrigger fanout exchange: " + UID + " Event topic: " + UID + " Event corrID: " + event.getCorrId());
 		channel.exchangeDeclare(UID, "fanout");
-		channel.basicPublish(UID, "", null, Serializer.serialize(wrapper));
+		
+		byte[] bytesResponse = Serializer.serialize(wrapper);
+		channel.basicPublish(UID, "", null, bytesResponse);
+
+		//Log.saveLog("Server-Serialize", bytesResponse);			
 	}
 
Index: /trunk/objectmq/src/omq/common/event/EventDispatcher.java
===================================================================
--- /trunk/objectmq/src/omq/common/event/EventDispatcher.java	(revision 29)
+++ /trunk/objectmq/src/omq/common/event/EventDispatcher.java	(revision 30)
@@ -96,5 +96,9 @@
 
 				System.out.println("Event received -> Topic: " + event.getTopic() + "CorrId: " + event.getCorrId());
-
+				//Log.saveLog("Client-Deserialize", delivery.getBody());
+				
+				//long timeEnd = (new Date()).getTime(); 
+				//Log.saveTimeSendRequestLog("Client-time-response", event.getCorrId(), "Event!",  timeEnd);
+				
 				// Dispatch it
 				dispatch(event.getTopic(), event);
Index: /trunk/objectmq/src/omq/common/util/Log.java
===================================================================
--- /trunk/objectmq/src/omq/common/util/Log.java	(revision 29)
+++ /trunk/objectmq/src/omq/common/util/Log.java	(revision 30)
@@ -2,5 +2,4 @@
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -9,6 +8,4 @@
 
 import omq.exception.EnvironmentException;
-
-import org.apache.commons.io.IOUtils;
 
 public class Log {
@@ -22,12 +19,15 @@
 				long timeNow = (new Date()).getTime();
 
-				File outputFolder = new File(debugPath + File.separator + processName);
+				File outputFolder = new File(debugPath + File.separator);
 				outputFolder.mkdirs();
+				
+//				File outputFolder = new File(debugPath + File.separator + processName);
+//				outputFolder.mkdirs();
 
-				File outputFileContent = new File(outputFolder.getAbsoluteFile() + File.separator + "content_" + timeNow);
-				FileOutputStream outputStream = new FileOutputStream(outputFileContent);
-				IOUtils.write(bytesResponse, outputStream);
-				outputStream.close();
-				
+//				File outputFileContent = new File(outputFolder.getAbsoluteFile() + File.separator + "content_" + timeNow);
+//				FileOutputStream outputStream = new FileOutputStream(outputFileContent);
+//				IOUtils.write(bytesResponse, outputStream);
+//				outputStream.close();
+
 				File outputFileLog = new File(debugPath + File.separator + "log");
 				boolean exist = outputFileLog.exists();
@@ -44,3 +44,27 @@
 		}
 	}
+	
+	public static void saveTimeSendRequestLog(String processName, String coorId, String method, long timeNow) throws IOException {
+		try {
+			Properties env = Environment.getEnvironment();
+
+			String debugPath = env.getProperty(ParameterQueue.DEBUGFILE, "");
+			if (debugPath.length() > 0) {			
+				File outputFolder = new File(debugPath + File.separator + processName);
+				outputFolder.mkdirs();
+				
+				File outputFileLog = new File(outputFolder + File.separator + "log");
+				boolean exist = outputFileLog.exists();
+				
+				FileWriter fw = new FileWriter(outputFileLog, true); // the true will append the new data
+				if(!exist){
+					fw.write("#CoorId\tMethod\tDate\n");
+				}
+				fw.write(coorId + "\t" + method + "\t" + timeNow + "\n");
+				fw.close();
+			}
+		} catch (EnvironmentException e) {
+			throw new IOException(e.getMessage(), e);
+		}
+	}	
 }
Index: /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java
===================================================================
--- /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java	(revision 29)
+++ /trunk/objectmq/src/omq/server/remote/request/InvocationThread.java	(revision 30)
@@ -5,5 +5,4 @@
 import omq.common.message.Request;
 import omq.common.message.Response;
-import omq.common.util.Log;
 import omq.common.util.Serializer;
 
@@ -36,5 +35,5 @@
 				// Deserialize the json
 				Request request = Serializer.deserializeRequest(delivery.getBody(), obj);
-				Log.saveLog("Server-Deserialize", delivery.getBody());
+				//Log.saveLog("Server-Deserialize", delivery.getBody());
 
 				String methodName = request.getMethod();
@@ -70,5 +69,5 @@
 					channel.basicPublish("", props.getReplyTo(), replyProps, bytesResponse);
 
-					Log.saveLog("Server-Serialize", bytesResponse);
+					//Log.saveLog("Server-Serialize", bytesResponse);
 				}