builds again

process/feta.go

@@ -6,7 +6,6 @@ import (
 
 	"git.eeqj.de/sneak/feta/database"
 	"git.eeqj.de/sneak/feta/ingester"
-	"git.eeqj.de/sneak/feta/instance"
 	"git.eeqj.de/sneak/feta/locator"
 	"git.eeqj.de/sneak/feta/manager"
 	"git.eeqj.de/sneak/feta/storage"
@@ -82,7 +81,6 @@ func (f *Feta) identify() {
 }
 
 func (f *Feta) setupDatabase() {
-	f.dbm = database.New()
 }
 
 func (f *Feta) setupLogging() {
@@ -118,20 +116,6 @@ func (f *Feta) uptime() time.Duration {
 	return time.Since(f.startup)
 }
 
-/*
-func (f *Feta) setupDatabase() {
-	var err error
-	f.db, err = gorm.Open("sqlite3", "feta.sqlite")
-
-
-	if err != nil {
-		panic(err)
-	}
-
-	//f.databaseMigrations()
-}
-*/
-
 func (f *Feta) runForever() int {
 	f.startup = time.Now()
 
@@ -139,10 +123,14 @@ func (f *Feta) runForever() int {
 
 	// FIXME move this channel creation into the manager's constructor
 	// and add getters/setters on the manager/locator
-	newInstanceHostnameNotifications := make(chan instance.Hostname)
+	newInstanceHostnameNotifications := make(chan string)
+
+	f.dbm = database.New()
 
 	f.locator = locator.New()
-	f.manager = manager.New()
+
+	f.manager = manager.New(f.dbm)
+
 	f.ingester = ingester.NewTootIngester()
 
 	home := os.Getenv("HOME")