From 8867c09db7de167544f98da078819cfb3fce7642 Mon Sep 17 00:00:00 2001
From: Timothy <yexiaozhou2003@gmail.com>
Date: Thu, 30 Jun 2016 17:12:13 +0800
Subject: [PATCH] Bug fix

---
 godns.go    | 16 ++++++----------
 settings.go |  3 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/godns.go b/godns.go
index 91b42ab..51dd5d9 100644
--- a/godns.go
+++ b/godns.go
@@ -64,21 +64,17 @@ func main() {
 		return
 	}
 
-	var err error
-	configuration, err = LoadSettings(*optConf)
-
-	err = InitLogger(configuration.Log_Path, configuration.Log_Size, configuration.Log_Num)
-	if err != nil {
-		log.Println("InitLogger error:", err)
-		return
-	}
-
-	if err != nil {
+	if err := LoadSettings(*optConf, &configuration); err != nil {
 		fmt.Println(err.Error())
 		log.Println(err.Error())
 		os.Exit(1)
 	}
 
+	if err := InitLogger(configuration.Log_Path, configuration.Log_Size, configuration.Log_Num); err != nil {
+		log.Println("InitLogger error:", err)
+		os.Exit(1)
+	}
+
 	dnsLoop()
 }
 
diff --git a/settings.go b/settings.go
index b080a7d..24bdfed 100644
--- a/settings.go
+++ b/settings.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 )
 
+//Settings struct
 type Settings struct {
 	Email      string
 	Password   string
@@ -20,7 +21,7 @@ type Settings struct {
 	Group      int
 }
 
-func LoadSettings(config_path string) (Settings, error) {
+func LoadSettings(config_path string, settings *Settings) error {
 	setting := Settings{}
 	file, err := ioutil.ReadFile(config_path)
 	if err != nil {