jro_apps/redmine Commit - r4762:a092f5e0b9af

scm: catch exception of getting command and version in model (#4273)....

Toshi MARUYAMA -

r4762:a092f5e0b9af

parent child

Context file:

r4762:a092f5e0b9af

Collapse all files

app/models/repository.rb +24 -6

                   user
                 end
               end
               # Fetches new changesets for all repositories of active projects
               # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
                     begin
                       project.repository.fetch_changesets
                     rescue Redmine::Scm::Adapters::CommandFailed => e
-                      logger.error "Repository: error during fetching changesets: #{e.message}"
+                      logger.error "scm: error during fetching changesets: #{e.message}"
                     end
                   end
                 end
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 find(:all).each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_command
-                self.scm_adapter_class.nil? ? "" : self.scm_adapter_class.client_command
+                ret = ""
+                begin
+                  ret = self.scm_adapter_class.client_command if self.scm_adapter_class
+                rescue Redmine::Scm::Adapters::CommandFailed => e
+                  logger.error "scm: error during get command: #{e.message}"
+                end
+                ret
               end
               def self.scm_version_string
-                self.scm_adapter_class.nil? ? "" : self.scm_adapter_class.client_version_string
+                ret = ""
+                begin
+                  ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
+                rescue Redmine::Scm::Adapters::CommandFailed => e
+                  logger.error "scm: error during get version string: #{e.message}"
+                end
+                ret
               end
               def self.scm_available
-                self.scm_adapter_class.nil? ? false : self.scm_adapter_class.client_available
+                ret = false
+                begin
+                  ret = self.scm_adapter_class.client_available if self.scm_adapter_class
+                rescue Redmine::Scm::Adapters::CommandFailed => e
+                  logger.error "scm: error during get scm available: #{e.message}"
+                end
+                ret
               end
               private

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages