Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 20:29:20 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 20:31:35 +0300
commit61c3aed8fc1105f9c85d636fe8de0197ddffbc63 (patch)
tree94d11838f583e675ff9013ddd367872b5f9b0044 /domains.go
parent920b15f69cd7749ab5f45b121132e92de2ef6e15 (diff)
Reduce code complexity
Diffstat (limited to 'domains.go')
-rw-r--r--domains.go26
1 files changed, 16 insertions, 10 deletions
diff --git a/domains.go b/domains.go
index 8db9e71e..9d8bdcc3 100644
--- a/domains.go
+++ b/domains.go
@@ -31,6 +31,21 @@ func (d domains) addDomain(group, project string, config *domainConfig) error {
return nil
}
+func (d domains) readProjectConfig(group, project string) (err error) {
+ var config domainsConfig
+ err = config.Read(group, project)
+ if err != nil {
+ return
+ }
+
+ for _, domainConfig := range config.Domains {
+ if domainConfig.Valid() {
+ d.addDomain(group, project, &domainConfig)
+ }
+ }
+ return
+}
+
func (d domains) readProject(group, project string) error {
if strings.HasPrefix(project, ".") {
return errors.New("hidden project")
@@ -46,16 +61,7 @@ func (d domains) readProject(group, project string) error {
return errors.New("missing public/ in project")
}
- var config domainsConfig
- err = config.Read(group, project)
- log.Println(err)
- if err == nil {
- for _, domainConfig := range config.Domains {
- if domainConfig.Valid() {
- d.addDomain(group, project, &domainConfig)
- }
- }
- }
+ d.readProjectConfig(group, project)
return nil
}