|
|
@@ -1,7 +1,6 @@
|
|
|
package app
|
|
|
|
|
|
import (
|
|
|
- "fmt"
|
|
|
"os/exec"
|
|
|
"pbx-api-gin/internal/app/ami/action"
|
|
|
"pbx-api-gin/internal/app/stc"
|
|
|
@@ -10,7 +9,6 @@ import (
|
|
|
"pbx-api-gin/internal/app/stc/socket"
|
|
|
"pbx-api-gin/pkg/lfshook"
|
|
|
"pbx-api-gin/pkg/utils"
|
|
|
- "strings"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
@@ -19,20 +17,12 @@ func StartApp() {
|
|
|
//mysql.CreateDBInstance()
|
|
|
|
|
|
//Get cab number acording to IP
|
|
|
- IP, err := getIPByCommand()
|
|
|
+ _, err := SetMasterCabNum()
|
|
|
if err != nil {
|
|
|
- lfshook.NewLogger().Infof("Get IP err :%+v", err)
|
|
|
+ lfshook.NewLogger().Infof("Set Role and Cab Num err :%+v", err)
|
|
|
}
|
|
|
|
|
|
- // Init cab number and master role
|
|
|
- if IP[len(IP)-2:] == "81" {
|
|
|
- active.Master = false
|
|
|
- active.CabNum = "8"
|
|
|
- } else {
|
|
|
- active.Master = true
|
|
|
- active.CabNum = "1"
|
|
|
- }
|
|
|
- lfshook.NewLogger().Infof("=================cab number:%s===========", active.CabNum)
|
|
|
+ lfshook.NewLogger().Infof("=================cab number:%s========Master:%+v===", active.CabNum, active.Master)
|
|
|
|
|
|
//init the active status
|
|
|
active.ActivedCab = ""
|
|
|
@@ -65,17 +55,18 @@ func StartApp() {
|
|
|
}
|
|
|
|
|
|
// Get eth0 IP
|
|
|
-func getIPByCommand() (string, error) {
|
|
|
- cmd := "ifconfig eth0 | grep 'inet addr:' | awk '{print $2}' | cut -d: -f2"
|
|
|
- out, err := exec.Command("bash", "-c", cmd).CombinedOutput()
|
|
|
- if err != nil {
|
|
|
- return "", err
|
|
|
- }
|
|
|
+func SetMasterCabNum() (string, error) {
|
|
|
+ cmd := "ip a |grep 10.0.11.11" //check Master IP
|
|
|
|
|
|
- ip := strings.TrimSpace(string(out))
|
|
|
- if ip == "" {
|
|
|
- return "", fmt.Errorf("no IP address found")
|
|
|
- }
|
|
|
+ out, _ := exec.Command("bash", "-c", cmd).CombinedOutput()
|
|
|
|
|
|
- return ip, nil
|
|
|
+ // Init cab number and master role
|
|
|
+ if len(out) == 0 {
|
|
|
+ active.Master = false
|
|
|
+ active.CabNum = "8"
|
|
|
+ } else {
|
|
|
+ active.Master = true
|
|
|
+ active.CabNum = "1"
|
|
|
+ }
|
|
|
+ return string(out), nil
|
|
|
}
|