aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <m.shulhan@gmail.com>2020-04-05 15:24:11 +0700
committerShulhan <m.shulhan@gmail.com>2020-04-05 15:24:11 +0700
commit79649636835eba0ea309c1208c1056b3e98d244a (patch)
treefbb201fca8fc365c75f87c35d446d64a24732c3d
parent46d02f63fd53cebecbd02417a8d3e9f1629e23d3 (diff)
downloadkamusku-79649636835eba0ea309c1208c1056b3e98d244a.tar.xz
server: add parameter to load dictionary storage
-rw-r--r--cmd/www-kbbi/main.go2
-rw-r--r--kamus_cache_test.go8
-rw-r--r--kbbi_test.go5
-rw-r--r--server.go7
4 files changed, 10 insertions, 12 deletions
diff --git a/cmd/www-kbbi/main.go b/cmd/www-kbbi/main.go
index 7a959d5..7a3933a 100644
--- a/cmd/www-kbbi/main.go
+++ b/cmd/www-kbbi/main.go
@@ -13,7 +13,7 @@ import (
)
func main() {
- server, err := kbbi.NewServer()
+ server, err := kbbi.NewServer("")
if err != nil {
log.Fatal(err)
}
diff --git a/kamus_cache_test.go b/kamus_cache_test.go
index fbeda02..44ccb92 100644
--- a/kamus_cache_test.go
+++ b/kamus_cache_test.go
@@ -10,12 +10,8 @@ import (
"github.com/shuLhan/share/lib/test"
)
-const (
- testStoragePath = "testdata/kamus.gob"
-)
-
func TestKamusCache_store_load(t *testing.T) {
- exp, err := newKamusCache(testStoragePath)
+ exp, err := newKamusCache(testKamusStorage)
if err != nil {
t.Fatal(err)
}
@@ -27,7 +23,7 @@ func TestKamusCache_store_load(t *testing.T) {
t.Fatal(err)
}
- got, err := newKamusCache(testStoragePath)
+ got, err := newKamusCache(testKamusStorage)
if err != nil {
t.Fatal(err)
}
diff --git a/kbbi_test.go b/kbbi_test.go
index ddd4efe..7d9a783 100644
--- a/kbbi_test.go
+++ b/kbbi_test.go
@@ -11,7 +11,8 @@ import (
)
const (
- testServerAPI = "http://127.0.0.1" + defListen
+ testServerAPI = "http://127.0.0.1" + defListen
+ testKamusStorage = "testdata/kamus.gob"
)
//nolint: gochecknoglobals
@@ -41,7 +42,7 @@ func TestMain(m *testing.M) {
var err error
// Run the local server to test the apiClient.
- testServer, err = NewServer()
+ testServer, err = NewServer(testKamusStorage)
if err != nil {
log.Fatal(err)
}
diff --git a/server.go b/server.go
index ec4aedd..e0e6b9c 100644
--- a/server.go
+++ b/server.go
@@ -39,9 +39,10 @@ type Server struct {
}
//
-// NewServer create and initialize the server.
+// NewServer create and initialize the server with optional path to dictionary
+// storage.
//
-func NewServer() (server *Server, err error) {
+func NewServer(kamusStorage string) (server *Server, err error) {
opts := &http.ServerOptions{
Address: defListen,
}
@@ -50,7 +51,7 @@ func NewServer() (server *Server, err error) {
stopped: make(chan bool, 1),
}
- server.kamus, err = newKamusCache("")
+ server.kamus, err = newKamusCache(kamusStorage)
if err != nil {
return nil, fmt.Errorf("http.NewServer: %w", err)
}