From ba4bcaf4409a52d432dae2e01b8ee6691161a63a Mon Sep 17 00:00:00 2001 From: Sean DuBois Date: Mon, 16 Jun 2014 08:15:26 +0000 Subject: [PATCH] Add failRegex to jail info --- Makefile | 1 + jail.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 91cf89e..79f9201 100644 --- a/Makefile +++ b/Makefile @@ -6,3 +6,4 @@ run: libs: go get github.com/kisielk/og-rek go get github.com/gorilla/mux + go get github.com/Sean-Der/fail2go diff --git a/jail.go b/jail.go index 0392529..c8e137b 100644 --- a/jail.go +++ b/jail.go @@ -2,19 +2,24 @@ package main import ( "encoding/json" - "github.com/gorilla/mux" "github.com/Sean-Der/fail2go" + "github.com/gorilla/mux" "net/http" ) func jailGetHandler(res http.ResponseWriter, req *http.Request) { jailStatus, _ := fail2go.JailStatus(mux.Vars(req)["jail"]) + jailFailRegex, _ := fail2go.JailFailRegex(mux.Vars(req)["jail"]) output := make(map[string]interface{}) for key, value := range jailStatus { output[key] = value } + for key, value := range jailFailRegex { + output[key] = value + } + encodedOutput, err := json.Marshal(output) if err != nil { } @@ -24,4 +29,5 @@ func jailGetHandler(res http.ResponseWriter, req *http.Request) { func jailHandler(jailRouter *mux.Router) { jailRouter.HandleFunc("/{jail}", jailGetHandler).Methods("GET") + }