Skip to content

Commit 3735429

Browse files
kingsterkingster
committed
move to mod, fix mysql params handling
1 parent 6482901 commit 3735429

File tree

6 files changed

+90
-22
lines changed

6 files changed

+90
-22
lines changed

‎distribution/make-deb.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ die(){
88
exit 1
99
}
1010

11+
12+
SED_CMD="sed"
13+
if [ "$(uname)" == "Darwin" ]; then
14+
SED_CMD="gsed"
15+
fi
16+
1117
function replacePlaceHolders() {
1218
file="$1"
13-
sed -i -e "s/_PACKAGE_/$PACKAGE/g" $file
19+
$SED_CMD -i -e "s/_PACKAGE_/$PACKAGE/g" $file
1420
}
1521

1622

@@ -31,7 +37,7 @@ replacePlaceHolders "${BUILD_ROOT}/DEBIAN/postrm"
3137
replacePlaceHolders "${BUILD_ROOT}/DEBIAN/postinst"
3238
replacePlaceHolders "${BUILD_ROOT}/DEBIAN/control"
3339

34-
sed -i "s/_VERSION_/$VERSION/g" $BUILD_ROOT/DEBIAN/control
40+
$SED_CMD -i "s/_VERSION_/$VERSION/g" $BUILD_ROOT/DEBIAN/control
3541

3642
rm -f $PACKAGE.deb
3743
dpkg-deb --build $BUILD_ROOT $PACKAGE.deb

‎distribution/upload.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
reposervice --host 10.85.51.142 --port "8080" pubrepo --repo oreka-api --appkey wbuild-0001.nm.flipkart.com --debs distribution/oreka-api.deb
3+
reposervice --host 10.24.0.41 --port "8080" pubrepo --repo oreka-api --appkey wbuild-0001.nm.flipkart.com --debs distribution/oreka-api.deb

‎go.mod

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module github.com/voiceip/oreka-api
2+
3+
go 1.13
4+
5+
require (
6+
github.com/fatih/color v1.9.0
7+
github.com/gin-gonic/gin v1.6.3
8+
github.com/go-sql-driver/mysql v1.5.0
9+
)

‎go.sum

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3+
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
4+
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
5+
github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
6+
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
7+
github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
8+
github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
9+
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
10+
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
11+
github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
12+
github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
13+
github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
14+
github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
15+
github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
16+
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
17+
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
18+
github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
19+
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
20+
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
21+
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
22+
github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
23+
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
24+
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
25+
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
26+
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
27+
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
28+
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
29+
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
30+
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
31+
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
32+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
33+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
34+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
35+
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
36+
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
37+
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
38+
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
39+
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
40+
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
41+
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
42+
golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
43+
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
44+
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
45+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
46+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
47+
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
48+
gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
49+
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎main.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package main
22

33
import (
4-
"github.com/gin-gonic/gin"
5-
"net/http"
64
"database/sql"
7-
_ "github.com/go-sql-driver/mysql"
85
"fmt"
9-
"github.com/voiceip/oreka-api/oreka"
106
"io"
11-
"strconv"
7+
"net/http"
8+
"os"
129
"path"
10+
"strconv"
1311
"strings"
14-
"os"
12+
13+
"github.com/gin-gonic/gin"
14+
_ "github.com/go-sql-driver/mysql"
15+
"github.com/voiceip/oreka-api/oreka"
1516
)
1617

1718
var DB *sql.DB
@@ -48,7 +49,7 @@ func setupRouter() *gin.Engine {
4849
r := gin.Default()
4950

5051
authorized := r.Group("/", gin.BasicAuth(gin.Accounts{
51-
"root": "root",
52+
"root": "root",
5253
"admin": "admin",
5354
}))
5455

@@ -61,7 +62,7 @@ func setupRouter() *gin.Engine {
6162
tape, err := getByCallId(callId)
6263
if err != nil {
6364
fmt.Println(err)
64-
c.JSON(http.StatusInternalServerError, gin.H{"message": "Internal Error", "reason" : err.Error()})
65+
c.JSON(http.StatusInternalServerError, gin.H{"message": "Internal Error", "reason": err.Error()})
6566
} else if tape != (oreka.OrkTape{}) {
6667
if _, err := os.Stat(recordBasePath + tape.Filename); os.IsNotExist(err) {
6768
c.JSON(http.StatusGone, tape)
@@ -81,7 +82,7 @@ func setupRouter() *gin.Engine {
8182
tape, err := getByCallId(callId)
8283
if err != nil {
8384
fmt.Println(err)
84-
c.JSON(http.StatusInternalServerError, gin.H{"message": "Internal Error", "reason" : err.Error()})
85+
c.JSON(http.StatusInternalServerError, gin.H{"message": "Internal Error", "reason": err.Error()})
8586
} else if tape != (oreka.OrkTape{}) {
8687
sourceMediaFile := recordBasePath + tape.Filename
8788
serveMediaFile(c, callId, format, sourceMediaFile)
@@ -117,7 +118,7 @@ func serveMediaFile(c *gin.Context, callId string, format string, mediaFile stri
117118
io.Copy(c.Writer, stream)
118119
}
119120
}
120-
case "wav", "ogg", "opus" :
121+
case "wav", "ogg", "opus":
121122
if fileExtension == format {
122123
c.File(mediaFile)
123124
} else {

‎oreka/db.go

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
package oreka
22

33
import (
4-
"io/ioutil"
5-
"encoding/xml"
6-
"strings"
74
"database/sql"
8-
"os"
5+
"encoding/xml"
96
"fmt"
7+
"io/ioutil"
8+
"os"
9+
"strings"
1010
)
1111

1212
var configFilePath = "/etc/oreka/database.hbm.xml"
1313

1414
type HibernateConfiguration struct {
15-
XMLName xml.Name `xml:"hibernate-configuration"`
16-
Text string `xml:",chardata"`
15+
XMLName xml.Name `xml:"hibernate-configuration"`
16+
Text string `xml:",chardata"`
1717
SessionFactory struct {
18-
Text string `xml:",chardata"`
18+
Text string `xml:",chardata"`
1919
Property []struct {
2020
Text string `xml:",chardata"`
2121
Name string `xml:"name,attr"`
2222
} `xml:"property"`
2323
} `xml:"session-factory"`
2424
}
2525

26-
2726
func SetupDatabase() (*sql.DB, error) {
2827

2928
xmlFile, err := os.Open(configFilePath)
@@ -59,10 +58,14 @@ func SetupDatabase() (*sql.DB, error) {
5958

6059
host = hostdbParts[0]
6160
database = hostdbParts[1]
61+
//remove params
62+
if pos := strings.Index(database, "?"); pos >= 0 {
63+
database = database[:pos]
64+
}
65+
6266
}
6367
}
6468

65-
6669
DB, err := sql.Open("mysql", username+":"+password+"@tcp("+host+":3306)/"+database)
6770

6871
if err != nil {

0 commit comments

Comments
 (0)