fixed amin man bugs

Author: YourTechBud

utils/admin/admin.go

@@ -31,6 +31,13 @@ func (m *Manager) SetConfig(admin *config.Admin) {
 	m.lock.Unlock()
 }
 
+// GetConfig returns the adming config
+func (m *Manager) GetConfig() *config.Admin {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	return m.admin
+}
+
 // SetOperationMode sets the operation mode
 func (m *Manager) SetOperationMode(op *config.OperationConfig) error {
 	m.lock.Lock()

utils/admin/validate.go

@@ -26,9 +26,7 @@ func newValidator(cb func()) *validator {
 // Start starts the validation process
 func (v *validator) startValidation(id, account, key string, mode int) error {
 	// Set validation status to active
-	v.lock.Lock()
-	v.active = true
-	v.lock.Unlock()
+	v.setActive(true)
 
 	if err := v.registerSpaceCloud(id, account, key, mode); err != nil {
 		return err
@@ -51,8 +49,8 @@ func (v *validator) startValidation(id, account, key string, mode int) error {
 			// Check if 15 days are lapsed without authorization
 			if time.Since(timer).Hours() > 24*15 {
 
-				// Reduce op mode to open source
-				v.reduceMode()
+				// Stop the validation process
+				v.stopValidation()
 				return
 			}
 
@@ -68,16 +66,20 @@ func (v *validator) startValidation(id, account, key string, mode int) error {
 }
 
 func (v *validator) stopValidation() {
-	v.lock.Lock()
-	v.active = false
+	v.setActive(false)
+	v.reduceMode()
 	if v.socket != nil {
 		v.socket.Close()
 	}
-	v.lock.Unlock()
 }
 
 func (v *validator) isActive() bool {
 	v.lock.Lock()
 	defer v.lock.Unlock()
 	return v.active
 }
+func (v *validator) setActive(active bool) {
+	v.lock.Lock()
+	v.active = active
+	v.lock.Unlock()
+}

utils/admin/websocket.go

@@ -3,7 +3,6 @@ package admin
 import (
 	"errors"
 	"log"
-	"os"
 	"time"
 
 	"github.com/gorilla/websocket"
@@ -63,7 +62,8 @@ func (v *validator) routineRead() error {
 
 			if !data.Ack {
 				log.Println("Validate Error -", data.Error)
-				os.Exit(-1)
+				// Reduce op mode to open source
+				v.stopValidation()
 			}
 		}
 	}

utils/handlers/config.go

@@ -258,10 +258,10 @@ func HandleLoadOperationModeConfig(adminMan *admin.Manager, syncMan *syncman.Syn
 			return
 		}
 
-		c := syncMan.GetGlobalConfig()
+		c := adminMan.GetConfig()
 
 		w.WriteHeader(http.StatusOK)
-		json.NewEncoder(w).Encode(map[string]interface{}{"operation": &c.Admin.Operation})
+		json.NewEncoder(w).Encode(map[string]interface{}{"operation": &c.Operation})
 	}
 }