ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into kd-live

Browse Source
This commit is contained in:
mountain
2023-08-16 21:44:47 +09:00
parent 9edea29983 42b4ade782
commit a97b9f0983
4 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/api.go
View File

@ -260,9 +260,7 @@ func (caller apiCaller) serviceAPI(w http.ResponseWriter, r *http.Request) error
atomic.StorePointer(&mg.serviceptr, unsafe.Pointer(&newService))
}
serptr := atomic.LoadPointer(&mg.service().serviceSerialized)
logger.Println(" loadPointer :", string(*(*[]byte)(serptr)))
w.Write(*(*[]byte)(serptr))
w.Write(mg.service().divisionsSerialized)
} else if r.Method == "POST" {
body, _ := io.ReadAll(r.Body)
var service serviceDescription
@ -297,8 +295,7 @@ func (caller apiCaller) serviceAPI(w http.ResponseWriter, r *http.Request) error
func (caller apiCaller) maintenanceAPI(w http.ResponseWriter, r *http.Request) error {
mg := caller.mg
if r.Method == "GET" {
serptr := atomic.LoadPointer(&mg.service().divisionsSerialized)
w.Write(*(*[]byte)(serptr))
w.Write(mg.service().divisionsSerialized)
} else if r.Method == "POST" {
var divs map[string]*Division
dec := json.NewDecoder(r.Body)