From f9072cbc24e9ca154a88e4f80f29209c123b114d Mon Sep 17 00:00:00 2001 From: donghee yang Date: Thu, 23 Aug 2012 20:12:21 +0900 Subject: [PATCH] [Title] Fixed timing of send "SUCC" when "register" operation is pkgsvr --- src/pkg_server/SocketRegisterListener.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pkg_server/SocketRegisterListener.rb b/src/pkg_server/SocketRegisterListener.rb index 5115b05..640047f 100644 --- a/src/pkg_server/SocketRegisterListener.rb +++ b/src/pkg_server/SocketRegisterListener.rb @@ -1,5 +1,5 @@ require 'socket' - +require 'thread' $LOAD_PATH.unshift File.dirname(__FILE__) $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/common" $LOAD_PATH.unshift File.dirname(File.dirname(__FILE__))+"/build_server" @@ -9,7 +9,7 @@ require "BuildComm" require "net/ftp" # mutax for register operation -$register_mutax = Mutax.new +$register_mutex = Mutex.new class SocketRegisterListener @@ -141,11 +141,12 @@ class SocketRegisterListener idx = idx + 1 end - # register mutax - $register_mutax.synchronize { + # register mutex + $register_mutex.synchronize { begin @parent_server.reload_dist_package() snapshot_name = @parent_server.register( file_path_list, dist_name, true, false, true) + BuildCommServer.send(req,"SUCC|#{snapshot_name}") rescue => e @log.error "register failed" @log.error e.message @@ -156,7 +157,6 @@ class SocketRegisterListener end } - BuildCommServer.send(req,"SUCC|#{snapshot_name}") BuildCommServer.send_end(req) end -- 2.34.1