summaryrefslogtreecommitdiff
path: root/rhimport
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2016-07-28 21:11:03 (GMT)
committerChristian Pointner <equinox@helsinki.at>2016-07-28 21:11:03 (GMT)
commit3d531954d12cbc09a8791581b1911e6e39d86203 (patch)
tree3a6ce23063922ccb5a0f613da60b49caf2d8bd6e /rhimport
parentc7f6ff81175a78c4fb497a5ac98c3806457f762f (diff)
major name refactoring for rddb and player as well
Diffstat (limited to 'rhimport')
-rw-r--r--rhimport/core.go4
-rw-r--r--rhimport/session_store.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/rhimport/core.go b/rhimport/core.go
index f01ed77..bf4a57e 100644
--- a/rhimport/core.go
+++ b/rhimport/core.go
@@ -137,7 +137,7 @@ type AttachmentChunk struct {
type Context struct {
conf *Config
- db *rddb.DBChan
+ db *rddb.DB
stdlog *log.Logger
dbglog *log.Logger
UserName string
@@ -169,7 +169,7 @@ type Context struct {
Cancel <-chan bool
}
-func NewContext(conf *Config, db *rddb.DBChan, stdlog, dbglog *log.Logger) *Context {
+func NewContext(conf *Config, db *rddb.DB, stdlog, dbglog *log.Logger) *Context {
if stdlog == nil {
stdlog = log.New(ioutil.Discard, "", 0)
}
diff --git a/rhimport/session_store.go b/rhimport/session_store.go
index bb36473..ec01071 100644
--- a/rhimport/session_store.go
+++ b/rhimport/session_store.go
@@ -133,7 +133,7 @@ func (user *sessionStoreUserElement) callUpdateHandlerRemove(id, refId string) {
type sessionStore struct {
store map[string]*sessionStoreUserElement
conf *Config
- db *rddb.DBChan
+ db *rddb.DB
stdlog *log.Logger
dbglog *log.Logger
quit chan bool
@@ -389,7 +389,7 @@ func (store *sessionStore) Cleanup() {
close(store.removeChan)
}
-func NewSessionStore(conf *Config, db *rddb.DBChan, stdlog, dbglog *log.Logger) (store *sessionStore, err error) {
+func NewSessionStore(conf *Config, db *rddb.DB, stdlog, dbglog *log.Logger) (store *sessionStore, err error) {
store = &sessionStore{}
store.conf = conf
store.db = db