Skip to content

Commit 4fb20d3

Browse files
Merge pull request #47 from System-Glitch/develop
v2.8.0
2 parents 73388b3 + 42b2095 commit 4fb20d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1323
-571
lines changed

β€Ž.github/workflows/test.ymlβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ jobs:
3434
go get github.com/client9/misspell/cmd/misspell
3535
go get github.com/rakyll/gotest
3636
37-
- name: Verify MySQL connection
37+
- name: Start MySQL
3838
run: |
39+
sudo /etc/init.d/mysql start
3940
while ! mysqladmin ping --silent; do
4041
sleep 1
4142
done
@@ -49,7 +50,7 @@ jobs:
4950
- name: Test
5051
run: |
5152
gotest -race -count=20 .
52-
gotest -v -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./... ./...
53+
gotest -v -p 1 -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=./... ./...
5354
go vet $(go list ./...)
5455
golint -set_exit_status $(go list ./...)
5556
gocyclo -over 15 .

β€Žconfig/config.goβ€Ž

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ func Load() error {
100100
panic(err)
101101
}
102102

103-
if !validateConfig() {
104-
return fmt.Errorf("Invalid config")
103+
if err := validateConfig(); err != nil {
104+
return err
105105
}
106106

107107
return err
@@ -242,16 +242,20 @@ func getConfigFilePath() string {
242242
return "config." + env + ".json"
243243
}
244244

245-
func validateConfig() bool {
245+
func validateConfig() error {
246+
message := "Invalid config:"
246247
valid := true
247248
for key, value := range config {
248249
if err := validateEntry(value, key); err != nil {
249-
fmt.Fprintln(os.Stderr, err)
250+
message += "\n- " + err.Error()
250251
valid = false
251252
}
252253
}
253254

254-
return valid
255+
if !valid {
256+
return fmt.Errorf(message)
257+
}
258+
return nil
255259
}
256260

257261
func validateEntry(value interface{}, key string) error {

β€Žconfig/config_test.goβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ func (suite *ConfigTestSuite) TestInvalidConfig() {
9797
val := Get("appName")
9898

9999
config["appName"] = true
100-
suite.False(validateConfig())
100+
err := validateConfig()
101+
suite.NotNil(err)
102+
suite.Equal("Invalid config:\n- Invalid config entry: \"appName\" type must be string", err.Error())
101103
config["appName"] = val
102104

103105
suite.Panics(func() {

β€Ždocs/404.htmlβ€Ž

Lines changed: 0 additions & 34 deletions
This file was deleted.

β€Ždocs/assets/css/0.styles.27b9d501.cssβ€Ž

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždocs/assets/css/0.styles.5ef76a77.cssβ€Ž

Lines changed: 0 additions & 1 deletion
This file was deleted.

β€Ždocs/assets/js/10.10c98a11.jsβ€Ž renamed to β€Ždocs/assets/js/10.04f05ba8.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždocs/assets/js/11.7fa16437.jsβ€Ž renamed to β€Ždocs/assets/js/11.ddd0eefe.jsβ€Ž

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Ždocs/assets/js/12.5c06dd5d.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)