From f319803eab9f6d0268c172bf09e56a0902b8453b Mon Sep 17 00:00:00 2001 From: xige-16 Date: Wed, 9 Sep 2020 19:09:02 +0800 Subject: [PATCH] Fix hardcode load config path Signed-off-by: xige-16 --- conf/conf.go | 4 ++-- go.mod | 1 - storage/internal/minio/minio_store.go | 2 +- writer/main.go | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/conf.go b/conf/conf.go index 9d69025e88..e0c46c010c 100644 --- a/conf/conf.go +++ b/conf/conf.go @@ -1,9 +1,9 @@ package conf import ( - "io/ioutil" "github.com/czs007/suvlim/storage/pkg/types" yaml "gopkg.in/yaml.v2" + "io/ioutil" ) // yaml.MapSlice @@ -60,7 +60,7 @@ func init() { func load_config() { //var config ServerConfig - filename := "github.com/czs007/suvlim/conf/config.yaml" + filename := "conf/config.yaml" source, err := ioutil.ReadFile(filename) if err != nil { panic(err) diff --git a/go.mod b/go.mod index ad39f82d2e..bad3b5bc54 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,6 @@ require ( golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect google.golang.org/grpc v1.31.0 google.golang.org/grpc/examples v0.0.0-20200828165940-d8ef479ab79a // indirect - google.golang.org/protobuf v1.25.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.3.0 sigs.k8s.io/yaml v1.2.0 // indirect diff --git a/storage/internal/minio/minio_store.go b/storage/internal/minio/minio_store.go index 3e8f5419dc..8319f3aa31 100644 --- a/storage/internal/minio/minio_store.go +++ b/storage/internal/minio/minio_store.go @@ -15,7 +15,7 @@ type minioDriver struct { func NewMinioDriver(ctx context.Context) (*minioDriver, error) { // to-do read conf - var endPoint = "192.168.2.28:9000" + var endPoint = "localhost:9000" var accessKeyID = "testminio" var secretAccessKey = "testminio" var useSSL = false diff --git a/writer/main.go b/writer/main.go index 0ffb0e9df7..44207e7155 100644 --- a/writer/main.go +++ b/writer/main.go @@ -3,10 +3,10 @@ package main import ( "context" "fmt" + "github.com/czs007/suvlim/conf" "github.com/czs007/suvlim/storage/pkg" "github.com/czs007/suvlim/writer/message_client" "github.com/czs007/suvlim/writer/write_node" - "github.com/czs007/suvlim/conf" "log" "sync" "time"