updated the notice endpoint to access the 'text' field in the payload for convenience
This commit is contained in:
parent
ecc1d4580f
commit
6e9887f726
@ -50,6 +50,12 @@ type json_out_server_stats struct {
|
|||||||
SshProxySessions int64 `json:"pxy-ssh-sessions"`
|
SshProxySessions int64 `json:"pxy-ssh-sessions"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this is a more specialized variant of json_in_notice
|
||||||
|
type json_in_server_notice struct {
|
||||||
|
Client string `json:"client"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
// ------------------------------------
|
// ------------------------------------
|
||||||
|
|
||||||
type server_ctl struct {
|
type server_ctl struct {
|
||||||
@ -580,7 +586,7 @@ func (ctl *server_ctl_notices) ServeHTTP(w http.ResponseWriter, req *http.Reques
|
|||||||
|
|
||||||
switch req.Method {
|
switch req.Method {
|
||||||
case http.MethodPost:
|
case http.MethodPost:
|
||||||
var noti json_in_notice
|
var noti json_in_server_notice
|
||||||
|
|
||||||
err = json.NewDecoder(req.Body).Decode(¬i)
|
err = json.NewDecoder(req.Body).Decode(¬i)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -588,7 +594,7 @@ func (ctl *server_ctl_notices) ServeHTTP(w http.ResponseWriter, req *http.Reques
|
|||||||
goto oops
|
goto oops
|
||||||
}
|
}
|
||||||
|
|
||||||
err = s.SendNotice("", noti.Text)
|
err = s.SendNotice(noti.Client, noti.Text)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
status_code = WriteJsonRespHeader(w, http.StatusInternalServerError)
|
status_code = WriteJsonRespHeader(w, http.StatusInternalServerError)
|
||||||
je.Encode(JsonErrmsg{Text: err.Error()})
|
je.Encode(JsonErrmsg{Text: err.Error()})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user