zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-06 17:29:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

removing some errors

Browse Source
This commit is contained in:
afeiszli
2021-08-19 17:35:14 -04:00
parent d0c2f06e60
commit cd37d7701b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/dnsHttpController.go
View File

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

2
controllers/networkHttpController.go
View File

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

3
servercfg/serverconf.go
View File

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