estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "pointChange"

Browse Source 
This reverts commit fb4dba161619c043b8acd4971eac5433eb6630ab.
This commit is contained in:
songzhibin97
2020-11-23 12:02:18 +08:00
parent 1ddd6dac4f
commit 8e87ae55a9
31 changed files with 114 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/service/sys_system.go
View File

@@ -24,7 +24,7 @@ func GetSystemConfig() (err error, conf config.Server) {
//@param: system model.System
//@return: err error
func SetSystemConfig(system *model.System) (err error) {
func SetSystemConfig(system model.System) (err error) {
cs := utils.StructToMap(system.Config)
for k, v := range cs {
global.GVA_VP.Set(k, v)
@@ -41,18 +41,19 @@ func SetSystemConfig(system *model.System) (err error) {
func GetServerInfo() (server *utils.Server, err error) {
var s utils.Server
s.Os = utils.InitOS()
if s.Cpu, err = utils.InitCPU(); err != nil {
if s.Cpu, err = utils.InitCPU(); err != nil{
global.GVA_LOG.Error("func utils.InitCPU() Failed!", zap.String("err", err.Error()))
return &s, err
}
if s.Rrm, err = utils.InitRAM(); err != nil {
if s.Rrm, err = utils.InitRAM(); err != nil{
global.GVA_LOG.Error("func utils.InitRAM() Failed!", zap.String("err", err.Error()))
return &s, err
}
if s.Disk, err = utils.InitDisk(); err != nil {
if s.Disk, err = utils.InitDisk(); err != nil{
global.GVA_LOG.Error("func utils.InitDisk() Failed!", zap.String("err", err.Error()))
return &s, err
}
return &s, nil
}