ref(storage,syslogish): make all storage adapter initialization func …

…return storage.Adapter

Fixes deis#89

storage/factory.go → storage/factory/factory.go

@@ -1,14 +1,15 @@
-package storage
+package factory
 
 import (
 	"fmt"
+	"github.com/deis/logger/storage"
 	"github.com/deis/logger/storage/file"
 	"github.com/deis/logger/storage/ringbuffer"
 )
 
 // NewAdapter returns a pointer to an appropriate implementation of the Adapter interface, as
 // determined by the storeageAdapterType string it is passed.
-func NewAdapter(storeageAdapterType string, numLines int) (Adapter, error) {
+func NewAdapter(storeageAdapterType string, numLines int) (storage.Adapter, error) {
 	if storeageAdapterType == "file" {
 		adapter, err := file.NewStorageAdapter()
 		if err != nil {

storage/factory_test.go → storage/factory/factory_test.go

@@ -1,4 +1,4 @@
-package storage
+package factory
 
 import (
 	"fmt"

storage/file/adapter.go

@@ -8,6 +8,8 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+
+	"github.com/deis/logger/storage"
 )
 
 var logRoot = "/data/logs"
@@ -18,7 +20,7 @@ type adapter struct {
 }
 
 // NewStorageAdapter returns a pointer to a new instance of a file-based storage.Adapter.
-func NewStorageAdapter() (*adapter, error) {
+func NewStorageAdapter() (storage.Adapter, error) {
 	return &adapter{files: make(map[string]*os.File)}, nil
 }
 

storage/file/adapter_test.go

@@ -82,10 +82,16 @@ func TestDestroy(t *testing.T) {
 		t.Error(err)
 	}
 	defer os.Remove(logRoot)
-	a, err := NewStorageAdapter()
+	sa, err := NewStorageAdapter()
 	if err != nil {
 		t.Error(err)
 	}
+
+	a, ok := sa.(*adapter)
+	if !ok {
+		t.Fatalf("returned adapter was not a ringBuffer")
+	}
+
 	// Write a log to create the file
 	if err := a.Write(app, "Hello, log!"); err != nil {
 		t.Error(err)
@@ -116,10 +122,14 @@ func TestReopen(t *testing.T) {
 		t.Error(err)
 	}
 	defer os.Remove(logRoot)
-	a, err := NewStorageAdapter()
+	sa, err := NewStorageAdapter()
 	if err != nil {
 		t.Error(err)
 	}
+	a, ok := sa.(*adapter)
+	if !ok {
+		t.Fatalf("returned adapter was not a ringBuffer")
+	}
 	// Write a log to create the file
 	if err := a.Write(app, "Hello, log!"); err != nil {
 		t.Error(err)

storage/ringbuffer/adapter.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"log"
 	"sync"
+
+	"github.com/deis/logger/storage"
 )
 
 type ringBuffer struct {
@@ -56,7 +58,7 @@ type adapter struct {
 }
 
 // NewStorageAdapter returns a pointer to a new instance of an in-memory storage.Adapter.
-func NewStorageAdapter(bufferSize int) (*adapter, error) {
+func NewStorageAdapter(bufferSize int) (storage.Adapter, error) {
 	if bufferSize <= 0 {
 		return nil, fmt.Errorf("Invalid ringBuffer size: %d", bufferSize)
 	}

storage/ringbuffer/adapter_test.go

@@ -9,10 +9,14 @@ const app string = "test-app"
 
 func TestReadFromNonExistingApp(t *testing.T) {
 	// Initialize a new storage adapter
-	a, err := NewStorageAdapter(10)
+	sa, err := NewStorageAdapter(10)
 	if err != nil {
 		t.Error(err)
 	}
+	a, ok := sa.(*adapter)
+	if !ok {
+		t.Fatalf("returned adapter was not a ringBuffer")
+	}
 	// No logs have been writter; there should be no ringBuffer for app
 	messages, err := a.Read(app, 10)
 	if messages != nil {
@@ -97,10 +101,15 @@ func TestLogs(t *testing.T) {
 }
 
 func TestDestroy(t *testing.T) {
-	a, err := NewStorageAdapter(10)
+	sa, err := NewStorageAdapter(10)
 	if err != nil {
 		t.Error(err)
 	}
+
+	a, ok := sa.(*adapter)
+	if !ok {
+		t.Fatalf("returned adapter was not a ringBuffer")
+	}
 	// Write a log to create the file
 	if err := a.Write(app, "Hello, log!"); err != nil {
 		t.Error(err)

syslogish/server.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/deis/logger/storage"
+	"github.com/deis/logger/storage/factory"
 )
 
 const (
@@ -47,7 +48,7 @@ func NewServer(storageType string, numLines int) (*Server, error) {
 		return nil, err
 	}
 
-	newStorageAdapter, err := storage.NewAdapter(storageType, numLines)
+	newStorageAdapter, err := factory.NewAdapter(storageType, numLines)
 	if err != nil {
 		return nil, fmt.Errorf("configurer: Error creating storage adapter: %v", err)
 	}