Mirror
/
fail2rest
mirror of https://github.com/Sean-Der/fail2rest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fail2go now has multi-value returns instead of maps, update effected code

This commit is contained in:
Sean DuBois 2014-06-20 13:58:57 +00:00
parent 149fb451a6
commit 5705bcd2ed
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jail.go
View File

@ -8,19 +8,18 @@ import (
)
func jailGetHandler(res http.ResponseWriter, req *http.Request, fail2goConn *fail2go.Fail2goConn) {
jailStatus, _ := fail2goConn.JailStatus(mux.Vars(req)["jail"])
jailFailRegex, _ := fail2goConn.JailFailRegex(mux.Vars(req)["jail"])
currentlyFailed, totalFailed, fileList, currentlyBanned, totalBanned, IPList, _ := fail2goConn.JailStatus(mux.Vars(req)["jail"])
failRegexes, _ := fail2goConn.JailFailRegex(mux.Vars(req)["jail"])
output := make(map[string]interface{})
encodedOutput, err := json.Marshal(map[string]interface{}{
"currentlyFailed": currentlyFailed,
"totalFailed": totalFailed,
"fileList": fileList,
"currentlyBanned": currentlyBanned,
"totalBanned": totalBanned,
"IPList": IPList,
"failregex": failRegexes})
for key, value := range jailStatus {
output[key] = value
}
for key, value := range jailFailRegex {
output[key] = value
}
encodedOutput, err := json.Marshal(output)
if err != nil {
}
@ -39,7 +38,7 @@ func jailBanIPHandler(res http.ResponseWriter, req *http.Request, fail2goConn *f
output, _ := fail2goConn.JailBanIP(mux.Vars(req)["jail"], input.IP)
encodedOutput, err := json.Marshal(output)
encodedOutput, err := json.Marshal(map[string]interface{}{"bannedIP": output})
if err != nil {
}
@ -54,7 +53,7 @@ func jailUnbanIPHandler(res http.ResponseWriter, req *http.Request, fail2goConn
output, _ := fail2goConn.JailUnbanIP(mux.Vars(req)["jail"], input.IP)
encodedOutput, err := json.Marshal(output)
encodedOutput, err := json.Marshal(map[string]interface{}{"unBannedIP": output})
if err != nil {
}