[Title] support user_email to register job

[Type] Enhancement
[Module] Toolchain /
[Priority] Major
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ifb547ecd3e7b3528aba4ff3edff5ea69d635ab42

diff --git a/src/build_server/CommonJob.rb b/src/build_server/CommonJob.rb
index dc84f9503357f53ac04a29d312ef27920b16f10d..50151aac994401f41ca4a1bca985c509bde3b302 100644 (file)
--- a/src/build_server/CommonJob.rb
+++ b/src/build_server/CommonJob.rb
@@ -68,12 +68,6 @@ class CommonJob
        public
        def set_parent_job( parent )
                @parent = parent
-
-               if not parent.nil? then
-                       @server.get_db_connection() do |db|
-                               db.do "UPDATE jobs SET parent_job_id = #{parent.id} WHERE id = #{@id}"
-                       end
-               end
        end
 
 

diff --git a/src/build_server/SocketJobRequestListener.rb b/src/build_server/SocketJobRequestListener.rb
index 3030f7d322113c29533ac0822135006f0372f533..d5dddc2646536255ef92e8efba4cffd8673f1f37 100644 (file)
--- a/src/build_server/SocketJobRequestListener.rb
+++ b/src/build_server/SocketJobRequestListener.rb
@@ -727,13 +727,15 @@ class SocketJobRequestListener
                        # add
                        @parent_server.jobmgr.add_job( new_job )
 
-                       # REGISTER|BINARY|filename|passwd|dock|dist_name
+                       # REGISTER|BINARY|filename|passwd|dock|dist_name|user_email
                when "BINARY"
                        # parse
                        filename = tok[2]
                        passwd = tok[3]
                        dock = (tok[4].nil? or tok[4].empty?) ? "0" : tok[4].strip
                        dist_name = tok[5]
+                       user_email = tok[6].strip
+
                        if (dist_name.nil? or dist_name.empty?) then
                                dist_name = @parent_server.distmgr.get_default_distribution_name()
                        end
@@ -761,6 +763,16 @@ class SocketJobRequestListener
                                raise "Creating build job failed : #{prj.name}, #{filename}"
                        end
 
+                       # check user email
+                       user_id = @parent_server.check_user_id_from_email( user_email )
+                       if user_id == -1 then
+                               BuildCommServer.send_begin(req)
+                               req.puts "Error: Cannot find the user with \"#{user_email}\"!"
+                               BuildCommServer.send_end(req)
+                               raise "No user information!"
+                       end
+                       new_job.user_id = user_id
+
                        # create logger and set
                        logger = JobLog.new( new_job, req )
                        new_job.set_logger(logger)