diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-07-28 21:11:57 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-07-28 21:11:57 (GMT) |
commit | 87f14cff0a86eff014ba52c3cfbbb70ff7cec0b4 (patch) | |
tree | f77ea1eacf2b9635f75441059e6f611059f78b7a /src/rhimportd/ctrlWebSimple.go | |
parent | 99b4f31e7d952664e39c5c76f03e08da00097053 (diff) |
incoporate latest rhrd-go changes
Diffstat (limited to 'src/rhimportd/ctrlWebSimple.go')
-rw-r--r-- | src/rhimportd/ctrlWebSimple.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rhimportd/ctrlWebSimple.go b/src/rhimportd/ctrlWebSimple.go index 8cc2ed0..f5d5225 100644 --- a/src/rhimportd/ctrlWebSimple.go +++ b/src/rhimportd/ctrlWebSimple.go @@ -91,7 +91,7 @@ func webSimpleResponse(w http.ResponseWriter, result *rhimport.Result) { encoder.Encode(respdata) } -func webSimpleParseRequest(conf *rhimport.Config, db *rddb.DBChan, trusted bool, r *http.Request) (ctx *rhimport.Context, err error) { +func webSimpleParseRequest(conf *rhimport.Config, db *rddb.DB, trusted bool, r *http.Request) (ctx *rhimport.Context, err error) { decoder := json.NewDecoder(r.Body) reqdata := newWebSimpleRequestData(conf) if jsonerr := decoder.Decode(reqdata); jsonerr != nil { @@ -122,7 +122,7 @@ func webSimpleParseRequest(conf *rhimport.Config, db *rddb.DBChan, trusted bool, return } -func webSimpleHandler(conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan, trusted bool, w http.ResponseWriter, r *http.Request) { +func webSimpleHandler(conf *rhimport.Config, db *rddb.DB, sessions *rhimport.SessionStore, trusted bool, w http.ResponseWriter, r *http.Request) { rhdl.Printf("WebSimpleHandler: %s requests '%s'", r.RemoteAddr, html.EscapeString(r.URL.Path)) var ctx *rhimport.Context |