Browse Source

removing some errors

afeiszli 4 years ago
parent
commit
cd37d7701b

+ 2 - 2
controllers/dnsHttpController.go

@@ -58,7 +58,7 @@ func getAllDNS(w http.ResponseWriter, r *http.Request) {
 func GetAllDNS() ([]models.DNSEntry, error) {
 	var dns []models.DNSEntry
 	networks, err := models.GetNetworks()
-	if err != nil {
+	if err != nil && !database.IsEmptyRecord(err) {
 		return []models.DNSEntry{}, err
 	}
 	for _, net := range networks {
@@ -139,7 +139,7 @@ func SetDNS() error {
 	hostfile := txeh.Hosts{}
 	var corefilestring string
 	networks, err := models.GetNetworks()
-	if err != nil {
+	if err != nil && !database.IsEmptyRecord(err){
 		return err
 	}
 

+ 1 - 1
controllers/networkHttpController.go

@@ -133,7 +133,7 @@ func getNetworks(w http.ResponseWriter, r *http.Request) {
 	err := errors.New("Networks Error")
 	if networksSlice[0] == ALL_NETWORK_ACCESS {
 		allnetworks, err = models.GetNetworks()
-		if err != nil {
+		if err != nil && !database.IsEmptyRecord(err){
 			returnErrorResponse(w, r, formatError(err, "internal"))
 			return
 		}

+ 2 - 1
servercfg/serverconf.go

@@ -59,6 +59,7 @@ func GetServerConfig() config.ServerConfig {
 	if DisableDefaultNet() {
 		cfg.DisableRemoteIPCheck = "on"
 	}
+	cfg.Database = GetDB()
 	cfg.Platform = GetPlatform()
 	cfg.Version = GetVersion()
 	return cfg
@@ -73,7 +74,7 @@ func GetAPIConnString() string {
 	return conn
 }
 func GetVersion() string {
-	version := "0.7.1"
+	version := "0.7.2"
 	if config.Config.Server.Version != "" {
 		version = config.Config.Server.Version
 	}