Add failRegex to jail info

This commit is contained in:
Sean DuBois 2014-06-16 08:15:26 +00:00
parent 405d61e729
commit ba4bcaf440
2 changed files with 8 additions and 1 deletions

View file

@ -6,3 +6,4 @@ run:
libs: libs:
go get github.com/kisielk/og-rek go get github.com/kisielk/og-rek
go get github.com/gorilla/mux go get github.com/gorilla/mux
go get github.com/Sean-Der/fail2go

View file

@ -2,19 +2,24 @@ package main
import ( import (
"encoding/json" "encoding/json"
"github.com/gorilla/mux"
"github.com/Sean-Der/fail2go" "github.com/Sean-Der/fail2go"
"github.com/gorilla/mux"
"net/http" "net/http"
) )
func jailGetHandler(res http.ResponseWriter, req *http.Request) { func jailGetHandler(res http.ResponseWriter, req *http.Request) {
jailStatus, _ := fail2go.JailStatus(mux.Vars(req)["jail"]) jailStatus, _ := fail2go.JailStatus(mux.Vars(req)["jail"])
jailFailRegex, _ := fail2go.JailFailRegex(mux.Vars(req)["jail"])
output := make(map[string]interface{}) output := make(map[string]interface{})
for key, value := range jailStatus { for key, value := range jailStatus {
output[key] = value output[key] = value
} }
for key, value := range jailFailRegex {
output[key] = value
}
encodedOutput, err := json.Marshal(output) encodedOutput, err := json.Marshal(output)
if err != nil { if err != nil {
} }
@ -24,4 +29,5 @@ func jailGetHandler(res http.ResponseWriter, req *http.Request) {
func jailHandler(jailRouter *mux.Router) { func jailHandler(jailRouter *mux.Router) {
jailRouter.HandleFunc("/{jail}", jailGetHandler).Methods("GET") jailRouter.HandleFunc("/{jail}", jailGetHandler).Methods("GET")
} }