Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Adding organization id to schema
  • Loading branch information
Evan Langlais committed Mar 14, 2019
1 parent c12fb74 commit eb290ec
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
7 changes: 4 additions & 3 deletions gateway.go
Expand Up @@ -26,7 +26,7 @@ var upgrader = websocket.Upgrader{}

func main() {

dbConnect() // Connect to the database
dbConnect() // Connect to the database
defer func() { // TODO: handle SIGINT
if err := dbConn.Close(); err != nil {
fmt.Printf("Error closing db connection: %v\n", err)
Expand Down Expand Up @@ -125,6 +125,7 @@ func (ws *socketConn) handleData(data Packet) {
var dataPackage = avro.NewDataPackage()
dataPackage.Generator = int32(genMap.mapping[ws.genId].databaseId)
// TODO: Have to get the generators state and region, probably in the same generator id map structure
dataPackage.Organization = int32(1)
dataPackage.State = avro.State(avro.StateCT)
dataPackage.Region = avro.Region(avro.RegionNORTHEAST)
for metric, stampedReadings := range msg {
Expand Down Expand Up @@ -160,8 +161,8 @@ func (ws *socketConn) handleData(data Packet) {
}

w := kafka.NewWriter(kafka.WriterConfig{
Brokers: []string{"sd5-data.engr.uconn.edu:9092"},
Topic: "GeneratorData",
Brokers: []string{"sd5-data.engr.uconn.edu:9092"},
Topic: "GeneratorData",
Balancer: &kafka.LeastBytes{},
})

Expand Down
11 changes: 6 additions & 5 deletions model/data_package.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions model/datapackage.avsc
Expand Up @@ -7,6 +7,10 @@
"type": "int",
"name": "generator"
},
{
"type": "int",
"name": "organization"
},
{
"name": "region",
"type": {
Expand Down
8 changes: 8 additions & 0 deletions model/primitive.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit eb290ec

Please sign in to comment.