send session id

2 files changed, 12 insertions, 7 deletions

diff --git a/xmake/modules/private/service/server/remote_build_server.lua b/xmake/modules/private/service/server/remote_build_server.lua
index 606dd3c41..09dee6ba8 100644
--- a/xmake/modules/private/service/server/remote_build_server.lua
+++ b/xmake/modules/private/service/server/remote_build_server.lua
@@ -41,19 +41,24 @@ end
 
 -- handle connect message
 function remote_build_server:handle_connect(stream, msg)
-    local ok = stream:send_msg(message.new_connect()) and stream:flush()
-    vprint("%s: %s send %s", self, stream:sock(), ok and "ok" or "failed")
+    local session_id = msg:session_id()
+    local respmsg = msg:clone()
+    respmsg:body().xmakever = xmake.version():shortstr()
+    local ok = stream:send_msg(respmsg) and stream:flush()
+    vprint("%s: %s: <session %s>: send %s", self, stream:sock(), session_id, ok and "ok" or "failed")
 end
 
 -- handle disconnect message
 function remote_build_server:handle_disconnect(stream, msg)
-    local ok = stream:send_msg(message.new_disconnect()) and stream:flush()
-    vprint("%s: %s send %s", self, stream:sock(), ok and "ok" or "failed")
+    local session_id = msg:session_id()
+    local respmsg = msg:clone()
+    local ok = stream:send_msg(respmsg) and stream:flush()
+    vprint("%s: %s: <session %s>: send %s", self, stream:sock(), session_id, ok and "ok" or "failed")
 end
 
 -- on handle message
 function remote_build_server:on_handle(stream, msg)
-    vprint("%s: %s on handle message(%d)", self, stream:sock(), msg:code())
+    vprint("%s: %s: <session %s>: on handle message(%d)", self, stream:sock(), msg:session_id(), msg:code())
     vprint(msg:body())
     if msg:is_connect() then
         self:handle_connect(stream, msg)
diff --git a/xmake/modules/private/service/server/server.lua b/xmake/modules/private/service/server/server.lua
index cbd1fcd3c..2acc230f6 100644
--- a/xmake/modules/private/service/server/server.lua
+++ b/xmake/modules/private/service/server/server.lua
@@ -120,7 +120,7 @@ end
 
 -- handle session
 function server:_handle_session(sock)
-    print("%s: %s session connected", self, sock)
+    print("%s: %s: session connected", self, sock)
     local stream = socket_stream(sock)
     while true do
         local msg = stream:recv_object()
@@ -130,7 +130,7 @@ function server:_handle_session(sock)
             break
         end
     end
-    print("%s: %s session end", self, sock)
+    print("%s: %s: session end", self, sock)
 end
 
 function server:__tostring()