|
@@ -1,17 +1,17 @@
|
|
package main
|
|
package main
|
|
|
|
|
|
import (
|
|
import (
|
|
- "encoding/json"
|
|
|
|
"fmt"
|
|
"fmt"
|
|
"git.swzry.com/zry/pathutils"
|
|
"git.swzry.com/zry/pathutils"
|
|
"gopkg.in/natefinch/lumberjack.v2"
|
|
"gopkg.in/natefinch/lumberjack.v2"
|
|
|
|
+ "gopkg.in/yaml.v2"
|
|
"io"
|
|
"io"
|
|
"io/ioutil"
|
|
"io/ioutil"
|
|
"os/exec"
|
|
"os/exec"
|
|
"sync"
|
|
"sync"
|
|
)
|
|
)
|
|
|
|
|
|
-var ConfigData ConfigJSON
|
|
|
|
|
|
+var ConfigData ConfigYAML
|
|
var FrontendShellLogger *lumberjack.Logger
|
|
var FrontendShellLogger *lumberjack.Logger
|
|
var BackendShellLogger *lumberjack.Logger
|
|
var BackendShellLogger *lumberjack.Logger
|
|
var mainWaitGroup sync.WaitGroup
|
|
var mainWaitGroup sync.WaitGroup
|
|
@@ -19,7 +19,7 @@ var mainWaitGroup sync.WaitGroup
|
|
func main() {
|
|
func main() {
|
|
fmt.Println("zDWSI Launcher Start.")
|
|
fmt.Println("zDWSI Launcher Start.")
|
|
CheckInit()
|
|
CheckInit()
|
|
- LoadJSON()
|
|
|
|
|
|
+ LoadYAML()
|
|
StartFrontend()
|
|
StartFrontend()
|
|
StartBackend()
|
|
StartBackend()
|
|
fmt.Println("Launcher Sleeping.")
|
|
fmt.Println("Launcher Sleeping.")
|
|
@@ -27,7 +27,7 @@ func main() {
|
|
}
|
|
}
|
|
|
|
|
|
func CheckInit() {
|
|
func CheckInit() {
|
|
- pe, err := pathutils.PathExists("/data/config.json")
|
|
|
|
|
|
+ pe, err := pathutils.PathExists("/data/config.yaml")
|
|
if err == nil && pe {
|
|
if err == nil && pe {
|
|
return
|
|
return
|
|
}
|
|
}
|
|
@@ -36,22 +36,23 @@ func CheckInit() {
|
|
pathutils.MkDirIfNotExist("/data/backend/", 0777)
|
|
pathutils.MkDirIfNotExist("/data/backend/", 0777)
|
|
pathutils.MkDirIfNotExist("/data/wwwroot/", 0777)
|
|
pathutils.MkDirIfNotExist("/data/wwwroot/", 0777)
|
|
pathutils.MkDirIfNotExist("/data/logs/", 0777)
|
|
pathutils.MkDirIfNotExist("/data/logs/", 0777)
|
|
- pathutils.CopyFile("/data/config.json", "/rel/config.default.json")
|
|
|
|
|
|
+ pathutils.CopyFile("/data/config.yaml", "/rel/config.default.yaml")
|
|
pathutils.CopyFile("/data/wwwroot/index.html", "/rel/index.default.html")
|
|
pathutils.CopyFile("/data/wwwroot/index.html", "/rel/index.default.html")
|
|
pathutils.CopyFile("/data/frontend/zDWSIFrontend", "/rel/zDWSIFrontend_linux")
|
|
pathutils.CopyFile("/data/frontend/zDWSIFrontend", "/rel/zDWSIFrontend_linux")
|
|
- fmt.Println("Container Initialized. Please Edit 'config.json'.")
|
|
|
|
|
|
+ pathutils.CopyFile("/data/frontend/zdwsi.frontend.config.yaml", "/rel/zdwsi.frontend.config.default.yaml")
|
|
|
|
+ fmt.Println("Container Initialized. Please Edit 'config.yaml'.")
|
|
}
|
|
}
|
|
|
|
|
|
-func LoadJSON() {
|
|
|
|
- fmt.Println("Load Config '/data/config.json'")
|
|
|
|
- jdata, err := ioutil.ReadFile("/data/config.json")
|
|
|
|
|
|
+func LoadYAML() {
|
|
|
|
+ fmt.Println("Load Config '/data/config.yaml'")
|
|
|
|
+ jdata, err := ioutil.ReadFile("/data/config.yaml")
|
|
if err != nil {
|
|
if err != nil {
|
|
- fmt.Println("failed read file 'config.json': ", err)
|
|
|
|
|
|
+ fmt.Println("failed read file 'config.yaml': ", err)
|
|
Dead()
|
|
Dead()
|
|
}
|
|
}
|
|
- err = json.Unmarshal(jdata, &ConfigData)
|
|
|
|
|
|
+ err = yaml.Unmarshal(jdata, &ConfigData)
|
|
if err != nil {
|
|
if err != nil {
|
|
- fmt.Println("failed parse 'config.json': ", err)
|
|
|
|
|
|
+ fmt.Println("failed parse 'config.yaml': ", err)
|
|
Dead()
|
|
Dead()
|
|
}
|
|
}
|
|
fmt.Println("Config Loaded.")
|
|
fmt.Println("Config Loaded.")
|
|
@@ -68,7 +69,7 @@ func RoutineSleep() {
|
|
FailureServer()
|
|
FailureServer()
|
|
}
|
|
}
|
|
|
|
|
|
-func InitLogger(cfg LumberjackLoggerJSON) *lumberjack.Logger {
|
|
|
|
|
|
+func InitLogger(cfg LumberjackLoggerYAML) *lumberjack.Logger {
|
|
ljl := &lumberjack.Logger{
|
|
ljl := &lumberjack.Logger{
|
|
Filename: cfg.FileName,
|
|
Filename: cfg.FileName,
|
|
MaxSize: cfg.MaxSize,
|
|
MaxSize: cfg.MaxSize,
|