modified create

app/controllers/quality_analysis_controller.rb

@@ -14,43 +14,53 @@ class QualityAnalysisController < ApplicationController
   end
 
   def create
-    user_name = User.find(params[:user_id]).try(:login)
+    begin
-    identifier = params[:identifier]
+      user_name = User.find(params[:user_id]).try(:login)
-    job_name = "#{user_name}:#{identifier}"
+      identifier = params[:identifier]
-    # Checks if the given job exists in Jenkins.
+      # REDO
-    unless @client.job.exists?(job_name)
+      job_name = "#{user_name}:#{identifier}"
-      @g = Gitlab.client
+
-      branch = params[:branch].blank? ? "master" : params[:branch]
+      # Checks if the given job exists in Jenkins.
-      language = params[:language]
+      unless @client.job.exists?(job_name)
-      path = params[:path]
+        @g = Gitlab.client
-      qa = QualityAnalysis.where(:project_id => @project.id).first
+        branch = params[:branch].blank? ? "master" : params[:branch]
-      version = qa.nil? ? 1 : qa.sonar_version + 1
+        language = params[:language]
-      properties = "sonar.projectKey=#{user_name}:#{identifier}
+        path = params[:path]
+        qa = QualityAnalysis.where(:project_id => @project.id).first
+        version = qa.nil? ? 1 : qa.sonar_version + 1
+        properties = "sonar.projectKey=#{user_name}:#{identifier}
         sonar.projectName=#{user_name}:#{identifier}
         sonar.projectVersion=#{version}
         sonar.sources=#{path}
         sonar.language=#{language.downcase}
         sonar.sourceEncoding=utf-8"
-      git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+        git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
-      # modify config.yml
+
-      @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+        # modify config.yml
-      @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+        @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
-      @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+        @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
-      @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+        @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
-      @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
+        @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
-      # relace gitlab hook
+
-      @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
+        # return '200' if successed
-      # build job
+        jenkins_job = @client.job.create("#{user_name}_#{identifier}", @doc.to_xml)
-      opts = {'build_start_timeout' => 30, 'cancel_on_build_start_timeout' => true}
+
-      code = @client.job.build("#{user_name}_#{identifier}", opts)
+        # replace gitlab hook
-      # sucessed will return "201"
+        @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{user_name}_#{identifier}")
-      raise "Unable to build job: #{user_name}_#{identifier}" unless code == '201'
+        # build job
-      if qa.blank? && code == '201'
+        logger.error("Test#{jenkins_job}")
-        QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+
-                               :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+        # return '201' if successed
-      else
+        code = @client.job.build("#{user_name}_#{identifier}")
-        qa.update_attribute(:sonar_version, version)
+        if qa.blank?
+          QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
+                                 :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => job_name)
+        else
+          qa.update_attribute(:sonar_version, version)
+        end
       end
+    rescue => e
+      puts e
     end
   end
 
@@ -90,10 +100,11 @@ class QualityAnalysisController < ApplicationController
   def connect_jenkins
     @gitlab_address = Redmine::Configuration['gitlab_address']
     @jenkins_address = Redmine::Configuration['jenkins_address']
+
     # connect jenkins
     @client = JenkinsApi::Client.new(:server_url => @jenkins_address, :username => "temp", :password => '123123')
-  rescue
+  rescue => e
-    logger.error("failed to connect Jenkins")
+    logger.error("failed to connect Jenkins ==> #{e}")
   end
 
 end