kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'alipniagov-fix-wiki_can_not_be_created_total-counter' into 'master'

Browse source 
Fix :wiki_can_not_be_created_total counter

See merge request gitlab-org/gitlab-ce!31673
This commit is contained in:
Thong Kuah 2019-08-12 11:35:11 +00:00
commit 832824f46e
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/services/projects/update_service.rb
View file

@ -122,7 +122,7 @@ module Projects
ProjectWiki.new(project, project.owner).wiki
rescue ProjectWiki::CouldNotCreateWikiError
log_error("Could not create wiki for #{project.full_name}")
Gitlab::Metrics.counter(:wiki_can_not_be_created_total, 'Counts the times we failed to create a wiki')
Gitlab::Metrics.counter(:wiki_can_not_be_created_total, 'Counts the times we failed to create a wiki').increment
end
def update_pages_config

5
changelogs/unreleased/alipniagov-fix-wiki_can_not_be_created_total-counter.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fix :wiki_can_not_be_created_total counter
merge_request: 31673
author:
type: fixed

5
spec/services/projects/update_service_spec.rb
View file

@ -186,7 +186,10 @@ describe Projects::UpdateService do
expect_any_instance_of(ProjectWiki).to receive(:wiki).and_raise(ProjectWiki::CouldNotCreateWikiError)
expect_any_instance_of(described_class).to receive(:log_error).with("Could not create wiki for #{project.full_name}")
expect(Gitlab::Metrics).to receive(:counter)
counter = double(:counter)
expect(Gitlab::Metrics).to receive(:counter).with(:wiki_can_not_be_created_total, 'Counts the times we failed to create a wiki').and_return(counter)
expect(counter).to receive(:increment)
update_project(project, user, project_feature_attributes: { wiki_access_level: ProjectFeature::ENABLED })
end