Merge pull request #41 from aceakash/master

CheckCompatibility mode now blows up if config file does not parse correctly
quii · Apr 26, 2016 · 5564138 · 5564138
2 parents 1ad7408 + c911ada
commit 5564138
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/application.go b/application.go
@@ -95,7 +95,6 @@ func (a *application) CheckCompatibility(configPath string, realURL string) erro
 }
 
 func (a *application) loadConfig() (endpoints []mockingjay.FakeEndpoint, err error) {
-
 	configData, err := a.configLoader(a.configPath)
 
 	if err != nil {
@@ -105,6 +104,9 @@ func (a *application) loadConfig() (endpoints []mockingjay.FakeEndpoint, err err
 	if newMD5 := md5.Sum(configData); newMD5 != a.yamlMD5 {
 		a.yamlMD5 = newMD5
 		endpoints, err = a.mockingjayLoader(configData)
+		if err != nil {
+			return nil, err
+		}
 	}
 	return
 }

diff --git a/main.go b/main.go
@@ -12,7 +12,10 @@ func main() {
 	app := defaultApplication(config.logger)
 
 	if config.realURL != "" {
-		app.CheckCompatibility(config.configPath, config.realURL)
+		err := app.CheckCompatibility(config.configPath, config.realURL)
+		if err != nil {
+			log.Fatal(err)
+		}
 	} else {
 		svr, err := app.CreateServer(config.configPath, config.monkeyConfigPath)