incoporate latest rhrd-go changes

1 files changed, 5 insertions, 5 deletions

diff --git a/src/rhimportd/routeWeb.go b/src/rhimportd/routeWeb.go
index d0582a2..0411239 100644
--- a/src/rhimportd/routeWeb.go
+++ b/src/rhimportd/routeWeb.go
@@ -34,17 +34,17 @@ import (
 
 type webHandler struct {
 	*rhimport.Config
-	*rddb.DBChan
-	*rhimport.SessionStoreChan
+	*rddb.DB
+	*rhimport.SessionStore
 	trusted bool
-	H       func(*rhimport.Config, *rddb.DBChan, *rhimport.SessionStoreChan, bool, http.ResponseWriter, *http.Request)
+	H       func(*rhimport.Config, *rddb.DB, *rhimport.SessionStore, bool, http.ResponseWriter, *http.Request)
 }
 
 func (self webHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	self.H(self.Config, self.DBChan, self.SessionStoreChan, self.trusted, w, r)
+	self.H(self.Config, self.DB, self.SessionStore, self.trusted, w, r)
 }
 
-func StartWebRouter(addr, staticDir string, conf *rhimport.Config, db *rddb.DBChan, sessions *rhimport.SessionStoreChan) {
+func StartWebRouter(addr, staticDir string, conf *rhimport.Config, db *rddb.DB, sessions *rhimport.SessionStore) {
 	http.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(staticDir))))
 
 	//	http.Handle("/trusted/simple", webHandler{conf, db, sessions, true, webSimpleHandler})