Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Johnlin/remove influxdb #15

Merged
merged 8 commits into from
Jun 20, 2018
+55 −99
Merged

Johnlin/remove influxdb #15

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac526d1
remove influx
John-Lin Jun 20, 2018
0fd4ef8
cleanup
John-Lin Jun 20, 2018
66575b1
cleanup
John-Lin Jun 20, 2018
85bc09d
cleanup
John-Lin Jun 20, 2018
f98e7c0
fix deps
John-Lin Jun 20, 2018
c39b4e4
remove linkernetwork/config
John-Lin Jun 20, 2018
4e21069
remove deps linkernetworks/config
John-Lin Jun 20, 2018
13062aa
deps removed
John-Lin Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions config/k8s.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
"url": "mongodb://35.189.177.37:31717/votex"
}
},
"influxdb": {
"url": "http://influxdb.default:8086",
"database": "lisa"
},
"logger": {
"dir": "./logs",
"level": "debug",
Expand All @@ -41,4 +37,4 @@
"version": "<GIT_COMMIT>",
"logFileName": "access_log"
}
}
}
6 changes: 1 addition & 5 deletions config/local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
"mongo": {
"url": "mongodb://localhost:31717/vortex_test"
},
"influxdb": {
"url": "http://localhost:8086",
"database": "lisa"
},
"logger": {
"dir": "./logs",
"level": "debug",
Expand All @@ -30,4 +26,4 @@
"version": "local",
"logFileName": "access_log"
}
}
}
6 changes: 1 addition & 5 deletions config/testing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
"mongo": {
"url": "mongodb://localhost:27017/vortex_test"
},
"influxdb": {
"url": "http://localhost:8086",
"database": "lisa"
},
"logger": {
"dir": "./logs",
"level": "debug",
Expand All @@ -30,4 +26,4 @@
"version": "local",
"logFileName": "access_log"
}
}
}
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN go install ./src/cmd/...

# the final image: vortex
FROM alpine:3.7
RUN apk add --no-cache ca-certificates rsync
RUN apk add --no-cache ca-certificates
WORKDIR /vortex

# copy the go binaries from the build image
Expand Down
2 changes: 1 addition & 1 deletion src/server/handler_network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"testing"

restful "github.com/emicklei/go-restful"
"github.com/influxdata/influxdb/pkg/testing/assert"
"github.com/linkernetworks/config"
"github.com/linkernetworks/vortex/src/entity"
"github.com/linkernetworks/vortex/src/serviceprovider"
"github.com/stretchr/testify/assert"
mgo "gopkg.in/mgo.v2"
"gopkg.in/mgo.v2/bson"
)
Expand Down
25 changes: 6 additions & 19 deletions src/serviceprovider/serviceprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@ import (
"github.com/linkernetworks/config"
"github.com/linkernetworks/logger"

"github.com/linkernetworks/gearman"
"github.com/linkernetworks/influxdb"
"github.com/linkernetworks/mongo"
"github.com/linkernetworks/redis"
)

type Container struct {
Config config.Config
Redis *redis.Service
Mongo *mongo.Service
Gearman *gearman.Service
Influxdb *influxdb.InfluxdbService
Config config.Config
Redis *redis.Service
Mongo *mongo.Service
}

type ServiceDiscoverResponse struct {
Expand All @@ -24,11 +20,6 @@ type ServiceDiscoverResponse struct {

type Service interface{}

func NewInfluxdbService(cf *influxdb.InfluxdbConfig) *influxdb.InfluxdbService {
logger.Infof("Connecting to influxdb: %s", cf.Url)
return &influxdb.InfluxdbService{Url: cf.Url}
}

func New(cf config.Config) *Container {
// setup logger configuration
logger.Setup(cf.Logger)
Expand All @@ -39,14 +30,10 @@ func New(cf config.Config) *Container {
logger.Infof("Connecting to mongodb: %s", cf.Mongo.Url)
mongo := mongo.New(cf.Mongo.Url)

logger.Infof("Connecting to influxdb: %s", cf.Influxdb.Url)
influx := &influxdb.InfluxdbService{Url: cf.Influxdb.Url}

sp := &Container{
Config: cf,
Redis: redisService,
Mongo: mongo,
Influxdb: influx,
Config: cf,
Redis: redisService,
Mongo: mongo,
}

return sp
Expand Down
54 changes: 0 additions & 54 deletions vendor/vendor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,36 +206,6 @@
"revision": "9cad4c3443a7200dd6400aef47183728de563a38",
"revisionTime": "2018-03-05T23:10:24Z"
},
{
"checksumSHA1": "OUzCEucDbeVwgno7zJyewECEP8U=",
"path": "github.com/influxdata/influxdb",
"revision": "968a3906213bba5c129fd9a4c1062874db60a611",
"revisionTime": "2018-06-14T00:50:14Z"
},
{
"checksumSHA1": "t06GpE7X4olsyp2d26RuKCDzC7w=",
"path": "github.com/influxdata/influxdb/client/v2",
"revision": "968a3906213bba5c129fd9a4c1062874db60a611",
"revisionTime": "2018-06-14T00:50:14Z"
},
{
"checksumSHA1": "CY8B/OcEr0wPuocuJ6lek0XmMys=",
"path": "github.com/influxdata/influxdb/models",
"revision": "968a3906213bba5c129fd9a4c1062874db60a611",
"revisionTime": "2018-06-14T00:50:14Z"
},
{
"checksumSHA1": "Z0Bb5PWa5WL/j5Dm2KJCLGn1l7U=",
"path": "github.com/influxdata/influxdb/pkg/escape",
"revision": "968a3906213bba5c129fd9a4c1062874db60a611",
"revisionTime": "2018-06-14T00:50:14Z"
},
{
"checksumSHA1": "FeDHPB6MLEx2dZAGDeCt2tf9Y+w=",
"path": "github.com/influxdata/influxdb/pkg/testing/assert",
"revision": "968a3906213bba5c129fd9a4c1062874db60a611",
"revisionTime": "2018-06-14T00:50:14Z"
},
{
"checksumSHA1": "NY84PNFBfNvxJgNEMVKUOJhcVsY=",
"path": "github.com/json-iterator/go",
Expand All @@ -260,36 +230,12 @@
"revision": "ba3bf9c1d0421aa146564a632931730344f1f9f1",
"revisionTime": "2018-02-20T04:22:22Z"
},
{
"path": "github.com/linkernetworks/aurora-debug",
"revision": ""
},
{
"path": "github.com/linkernetworks/aurora-debug/github.com/emicklei/go-restful",
"revision": ""
},
{
"path": "github.com/linkernetworks/aurora/src/net/http",
"revision": ""
},
{
"checksumSHA1": "ZhjkfAPQ1hqwwB+9j6GJ87tEnic=",
"path": "github.com/linkernetworks/config",
"revision": "cbdafe0080a7c89be42fa877ffb56d4f31456461",
"revisionTime": "2018-05-31T09:50:42Z"
},
{
"checksumSHA1": "WCxdMPK7lH+ioCiLYCs7ZE7msHs=",
"path": "github.com/linkernetworks/gearman",
"revision": "00fe5cdcf5ea006ce07ee865d773cfd151b9eb4e",
"revisionTime": "2018-05-25T05:43:38Z"
},
{
"checksumSHA1": "9t3LloU9ZmgeFE1blkKyXap0jyY=",
"path": "github.com/linkernetworks/influxdb",
"revision": "ad9cd5b7d4402a0cbd0613d043d48fb6e476d8bd",
"revisionTime": "2018-05-25T05:46:49Z"
},
{
"checksumSHA1": "Ywtth3s9PIYxkXxuojeo76lGO14=",
"path": "github.com/linkernetworks/logger",
Expand Down