File tree 2 files changed +11
-8
lines changed
lib/redmine_git_hosting/config
2 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ def gitolite_infos
21
21
begin
22
22
RedmineGitHosting ::Commands . gitolite_infos
23
23
rescue RedmineGitHosting ::Error ::GitoliteCommandException => e
24
- logger . error ( 'Error while getting Gitolite infos, check your SSH keys path or your Git user.' )
24
+ logger . error ( 'Error while getting Gitolite infos, check your SSH keys ( path, permissions) or your Git user.' )
25
25
nil
26
26
end
27
27
end
Original file line number Diff line number Diff line change @@ -20,13 +20,12 @@ def included(receiver)
20
20
module ClassMethods
21
21
22
22
def mirroring_public_key
23
- @mirroring_public_key ||=
24
- begin
25
- format_mirror_key ( gitolite_ssh_public_key_content )
26
- rescue => e
27
- logger . error ( "Error while loading mirroring public key : #{ e . output } " )
28
- nil
29
- end
23
+ begin
24
+ format_mirror_key ( gitolite_ssh_public_key_content )
25
+ rescue => e
26
+ logger . error ( "Error while loading mirroring public key : #{ e . output } " )
27
+ nil
28
+ end
30
29
end
31
30
32
31
@@ -60,11 +59,15 @@ def gitolite_mirroring_script
60
59
61
60
def gitolite_ssh_public_key_content
62
61
File . read ( gitolite_ssh_public_key )
62
+ rescue => e
63
+ nil
63
64
end
64
65
65
66
66
67
def gitolite_ssh_private_key_content
67
68
File . read ( gitolite_ssh_private_key )
69
+ rescue => e
70
+ nil
68
71
end
69
72
70
73
You can’t perform that action at this time.
0 commit comments