Merge pull request #260 from linkernetworks/johnlin/remove-redis-dep

johnlin/remove redis dep
linkernetworks · Aug 20, 2018 · cb9fe41 · cb9fe41
2 parents 0bb56f4 + ec0bf0e
commit cb9fe41
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 64 deletions.
diff --git a/config/k8s.json b/config/k8s.json
@@ -1,18 +1,4 @@
 {
-    "redis": {
-        "host": "redis.default",
-        "port": 6379,
-        "pool": {
-            "maxIdle": 100,
-            "_": "do not limit maxActive connection",
-            "maxActive": 0,
-            "idleTimeout": 60
-        },
-        "public": {
-            "host": "35.189.177.37",
-            "port": 32199
-        }
-    },
     "mongo": {
         "url": "mongodb://mongo.vortex.svc.cluster.local:27017/vortex",
         "public": {

diff --git a/config/local.json b/config/local.json
@@ -1,11 +1,4 @@
 {
-    "redis": {
-        "host": "localhost",
-        "port": 6379,
-        "public": {
-            "host": "localhost"
-        }
-    },
     "mongo": {
         "url": "mongodb://localhost:27017/vortex_test"
     },

diff --git a/config/testing.json b/config/testing.json
@@ -1,11 +1,4 @@
 {
-  "redis": {
-    "host": "localhost",
-    "port": 6379,
-    "public": {
-      "host": "localhost"
-    }
-  },
   "mongo": {
     "url": "mongodb://localhost:27017/vortex_test"
   },

diff --git a/src/config/config.go b/src/config/config.go
@@ -7,14 +7,12 @@ import (
 
 	"github.com/linkernetworks/logger"
 	"github.com/linkernetworks/mongo"
-	"github.com/linkernetworks/redis"
 	"github.com/linkernetworks/vortex/src/prometheusprovider"
 	"github.com/linkernetworks/vortex/src/registry"
 )
 
 // Config is the structure for vortex
 type Config struct {
-	Redis      *redis.RedisConfig                   `json:"redis"`
 	Mongo      *mongo.MongoConfig                   `json:"mongo"`
 	Prometheus *prometheusprovider.PrometheusConfig `json:"prometheus"`
 	Registry   *registry.Config                     `json:"registry"`

diff --git a/src/serviceprovider/serviceprovider.go b/src/serviceprovider/serviceprovider.go
@@ -10,7 +10,6 @@ import (
 	"github.com/linkernetworks/vortex/src/prometheusprovider"
 
 	"github.com/linkernetworks/mongo"
-	"github.com/linkernetworks/redis"
 	kubeCtl "github.com/linkernetworks/vortex/src/kubernetes"
 
 	"gopkg.in/go-playground/validator.v9"
@@ -23,7 +22,6 @@ import (
 // Container is the structure for container
 type Container struct {
 	Config     config.Config
-	Redis      *redis.Service
 	Mongo      *mongo.Service
 	Prometheus *prometheusprovider.Service
 	KubeCtl    *kubeCtl.KubeCtl
@@ -43,9 +41,6 @@ func New(cf config.Config) *Container {
 	// setup logger configuration
 	logger.Setup(cf.Logger)
 
-	logger.Infof("Connecting to redis: %s", cf.Redis.Addr())
-	redisService := redis.New(cf.Redis)
-
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
@@ -69,7 +64,6 @@ func New(cf config.Config) *Container {
 
 	sp := &Container{
 		Config:     cf,
-		Redis:      redisService,
 		Mongo:      mongo,
 		Prometheus: prometheus,
 		KubeCtl:    kubeCtl.New(clientset),
@@ -84,9 +78,6 @@ func NewForTesting(cf config.Config) *Container {
 	// setup logger configuration
 	logger.Setup(cf.Logger)
 
-	logger.Infof("Connecting to redis: %s", cf.Redis.Addr())
-	redisService := redis.New(cf.Redis)
-
 	logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
 	mongo := mongo.New(cf.Mongo.Url)
 
@@ -101,7 +92,6 @@ func NewForTesting(cf config.Config) *Container {
 
 	sp := &Container{
 		Config:     cf,
-		Redis:      redisService,
 		Mongo:      mongo,
 		Prometheus: prometheus,
 		KubeCtl:    kubeCtl.New(clientset),

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -164,18 +164,6 @@
 			"revision": "5831880292e721c76b58a16ecc60adc27d8e6355",
 			"revisionTime": "2018-06-12T18:59:29Z"
 		},
-		{
-			"checksumSHA1": "w3QCCIYHgZzIXQ+xTl7oLfFrXHs=",
-			"path": "github.com/gomodule/redigo/internal",
-			"revision": "bb5990dc771ab24e169aaea90ee3b9ad50cffce9",
-			"revisionTime": "2018-06-01T13:19:09Z"
-		},
-		{
-			"checksumSHA1": "HgOVOUtWUYHcNe8aipwuEZ7YLow=",
-			"path": "github.com/gomodule/redigo/redis",
-			"revision": "bb5990dc771ab24e169aaea90ee3b9ad50cffce9",
-			"revisionTime": "2018-06-01T13:19:09Z"
-		},
 		{
 			"checksumSHA1": "PKVjAJ/e0p/jWtGpZycgoZBLdb4=",
 			"path": "github.com/google/btree",
@@ -280,18 +268,6 @@
 			"version": "=v0.4.3",
 			"versionExact": "v0.4.3"
 		},
-		{
-			"checksumSHA1": "gPGlywe21cA6SuD6R1xbTntW1fc=",
-			"path": "github.com/linkernetworks/redis",
-			"revision": "5d54c7e9d23f75032121cf5aaa8b27e8914a5c10",
-			"revisionTime": "2018-06-04T18:46:57Z"
-		},
-		{
-			"checksumSHA1": "8ejg/kxhpSBDPHteEQwFgLqbank=",
-			"path": "github.com/linkernetworks/serviceconfig",
-			"revision": "1a3a6c6228e3e958b2e42535ef173804470f0884",
-			"revisionTime": "2018-05-18T07:18:51Z"
-		},
 		{
 			"checksumSHA1": "8bkCE7r0DcTaPDbKbwaI34Bmrbw=",
 			"path": "github.com/linkernetworks/utils/timeutils",