use docker, adding redis

Dockerfile

@@ -1,11 +0,0 @@
-FROM golang:alpine
-
-RUN mkdir -p /src
-WORKDIR /src
-
-ENV GO111MODULE=on
-
-COPY . .
-RUN go build
-
-CMD ["bit4sat"]

api.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/storage"
+	"git.sp4ke.com/sp4ke/bit4sat/storage"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
 )

bit4sat.sqbpro

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="/home/spike/projects/bit4sat/server/db-storage/bit4sat.sqlite" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="1"/><attached/><window><main_tabs open="structure browser query pragmas" current="1"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="100"/><column_width id="3" width="2105"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="upload"/><default_encoding codec=""/><browse_table_settings><table schema="" name="" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><conditional_formats/><display_formats/><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths><column index="1" value="275"/><column index="2" value="176"/><column index="3" value="256"/></column_widths><filter_values/><conditional_formats/><display_formats><column index="7" value=""/></display_formats><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload_status" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><conditional_formats/><display_formats/><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload_with_status" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths><column index="7" value="0"/><column index="8" value="0"/></column_widths><filter_values/><conditional_formats/><display_formats/><hidden_columns><column index="7" value="1"/><column index="8" value="1"/></hidden_columns><plot_y_axes/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1">SELECT EXISTS (SELECT upload_id FROM upload WHERE upload_id = '1Ijbco3pYIrl2VzTslERxszEHG1');</sql><sql name="SQL 2">SELECT * FROM upload JOIN upload_status ON upload.status = upload_status.type;</sql><current_tab id="1"/></tab_sql></sqlb_project>
+<?xml version="1.0" encoding="UTF-8"?><sqlb_project><db path="/home/spike/projects/bit4sat/db-storage/bit4sat.sqlite" readonly="0" foreign_keys="1" case_sensitive_like="0" temp_store="0" wal_autocheckpoint="1000" synchronous="1"/><attached/><window><main_tabs open="structure browser query pragmas" current="1"/></window><tab_structure><column_width id="0" width="300"/><column_width id="1" width="0"/><column_width id="2" width="100"/><column_width id="3" width="2105"/><column_width id="4" width="0"/><expanded_item id="0" parent="1"/><expanded_item id="1" parent="1"/><expanded_item id="2" parent="1"/><expanded_item id="3" parent="1"/></tab_structure><tab_browse><current_table name="upload"/><default_encoding codec=""/><browse_table_settings><table schema="" name="" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><conditional_formats/><display_formats/><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths><column index="1" value="275"/><column index="2" value="176"/><column index="3" value="256"/></column_widths><filter_values/><conditional_formats/><display_formats><column index="7" value=""/></display_formats><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload_status" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths/><filter_values/><conditional_formats/><display_formats/><hidden_columns/><plot_y_axes/></table><table schema="main" name="upload_with_status" show_row_id="0" encoding="" plot_x_axis="" unlock_view_pk=""><sort/><column_widths><column index="7" value="0"/><column index="8" value="0"/></column_widths><filter_values/><conditional_formats/><display_formats/><hidden_columns><column index="7" value="1"/><column index="8" value="1"/></hidden_columns><plot_y_axes/></table></browse_table_settings></tab_browse><tab_sql><sql name="SQL 1">SELECT EXISTS (SELECT upload_id FROM upload WHERE upload_id = '1Ijbco3pYIrl2VzTslERxszEHG1');</sql><sql name="SQL 2">SELECT * FROM upload JOIN upload_status ON upload.status = upload_status.type;</sql><current_tab id="1"/></tab_sql></sqlb_project>

db/db.go

@@ -7,9 +7,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/utils"
+	"git.sp4ke.com/sp4ke/bit4sat/utils"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/mediocregopher/radix/v3"
 )
 
 const (
@@ -28,7 +29,8 @@ var (
 )
 
 type Database struct {
-	Handle *sqlx.DB
+	Sql   *sqlx.DB
+	Redis *radix.Pool
 }
 
 func (d *Database) Open() error {
@@ -57,13 +59,13 @@ func (d *Database) Open() error {
 
 	log.Printf("Opening sqlite db %s\n", dsn)
 
-	d.Handle, err = sqlx.Open("sqlite3", dsn)
+	d.Sql, err = sqlx.Open("sqlite3", dsn)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Execute Pragmas
-	d.Handle.MustExec(DBPragma)
+	d.Sql.MustExec(DBPragma)
 
 	return nil
 }
@@ -83,4 +85,10 @@ func RollbackTx(tx *sqlx.Tx, callback func()) {
 func init() {
 	DB = &Database{}
 	DB.Open()
+
+	var err error
+	DB.Redis, err = radix.NewPool("tcp", "redis:6379", 10)
+	if err != nil {
+		log.Fatal(err)
+	}
 }

docker-compose.yml

@@ -2,27 +2,38 @@ version: "3.4"
 
 volumes:
     redis:
-        name: bit4sat-data
+    file-storage:
+    sqlite:
+    gocache:
 
 services:
     bit4sat:
         image: sp4ke/bit4sat
-        build:
-            context: .
-
-
+        build: ./docker
         environment:
             - GO111MODULE=on
+            - BIT4SAT_DB_PATH=/sqlite
+            - GOPATH=/go
 
-        deploy:
-            replicas: 1
+        #deploy:
+            #replicas: 1
+            #
+        ports:
+            - "8880:8880"
 
         volumes:
             - $PWD:/src
+            - gocache:/go
+            - ./db-storage:/sqlite
 
         working_dir: /src
 
-        command:
-            - go
-            - "run *.go"
+    redis:
+        image: redis:alpine
 
+        volumes:
+            - redis:/data
+
+        command:
+            - redis-server
+            - --appendonly yes

go.mod

@@ -4,18 +4,9 @@ go 1.12
 
 require (
 	github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a
-	github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 // indirect
 	github.com/gin-gonic/gin v1.3.0
-	github.com/golang/protobuf v1.3.1 // indirect
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/mattn/go-isatty v0.0.7 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0
+	github.com/mediocregopher/radix/v3 v3.2.3
 	github.com/segmentio/ksuid v1.0.2
-	github.com/stretchr/testify v1.3.0 // indirect
-	github.com/ugorji/go/codec v0.0.0-20190315113641-a70535d8491c // indirect
-	golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53 // indirect
-	golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54 // indirect
-	google.golang.org/appengine v1.5.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

go.sum

@@ -1,71 +1,37 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a h1:zBycVvXa03SIX+jdMv8wGu9TMDMWdN8EhaR1FoeKHNo=
 github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a/go.mod h1:pL2kNE+DgDU+eQ+dary5bX0Z6LPP8nR6Mqs1iejILw4=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY=
 github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
-github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
-github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
 github.com/gin-gonic/gin v1.3.0 h1:kCmZyPklC0gVdL728E6Aj20uYBJV93nj/TkwBTKhFbs=
 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
-github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
-github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc=
-github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg=
+github.com/mediocregopher/radix/v3 v3.2.3 h1:TbcGCZdo9zfPYPgevsqRn+OjvCyfOK6TzuXhqzWdCt0=
+github.com/mediocregopher/radix/v3 v3.2.3/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/segmentio/ksuid v1.0.2 h1:9yBfKyw4ECGTdALaF09Snw3sLJmYIX6AbPJrAy6MrDc=
 github.com/segmentio/ksuid v1.0.2/go.mod h1:BXuJDr2byAiHuQaQtSKoXh1J0YmUDurywOXgB2w+OSU=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/ugorji/go v1.1.2 h1:JON3E2/GPW2iDNGoSAusl1KDf5TRQ8k8q7Tp097pZGs=
-github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 h1:EICbibRW4JNKMcY+LsWmuwob+CRS1BmdRdjphAm9mH4=
 github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/ugorji/go/codec v0.0.0-20190315113641-a70535d8491c h1:20Yyqg0mvFOyG3m7ejVqHEa03CBa3hTttx9jiYLkjYU=
-github.com/ugorji/go/codec v0.0.0-20190315113641-a70535d8491c/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53 h1:kcXqo9vE6fsZY5X5Rd7R1l7fTgnWaDCVmln65REefiE=
-golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54 h1:xe1/2UUJRmA9iDglQSlkx8c5n3twv58+K0mPpC2zmhA=
-golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=

main.go

@@ -1,9 +1,9 @@
 package main
 
-import "git.sp4ke.com/sp4ke/bit4sat-server.git/db"
+import "git.sp4ke.com/sp4ke/bit4sat/db"
 
 func main() {
-	defer db.DB.Handle.Close()
+	defer db.DB.Sql.Close()
 	api := NewAPI()
 
 	api.Run()

storage/storage.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/utils"
+	"git.sp4ke.com/sp4ke/bit4sat/utils"
 )
 
 const (

storage/upload_ctrl.go

@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"os"
 
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/db"
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/utils"
+	"git.sp4ke.com/sp4ke/bit4sat/db"
+	"git.sp4ke.com/sp4ke/bit4sat/utils"
 	"github.com/gin-gonic/gin"
 	"github.com/segmentio/ksuid"
 )
@@ -29,7 +29,7 @@ func (ctrl UploadCtrl) New(c *gin.Context) {
 	// Create unique id
 	id := ksuid.New()
 
-	tx, err := db.DB.Handle.Beginx()
+	tx, err := db.DB.Sql.Beginx()
 	if err != nil {
 		utils.JSONErrPriv(c, http.StatusInternalServerError, err)
 		return
@@ -61,6 +61,7 @@ func (ctrl UploadCtrl) New(c *gin.Context) {
 		return
 	}
 
+	log.Println("new upload created")
 	c.JSON(http.StatusOK, gin.H{
 		"status": http.StatusOK,
 		"result": gin.H{
@@ -94,7 +95,7 @@ func (ctrl UploadCtrl) Upload(c *gin.Context) {
 
 	files := form.File["upload[]"]
 
-	tx, err := db.DB.Handle.Beginx()
+	tx, err := db.DB.Sql.Beginx()
 	if err != nil {
 		utils.JSONErrPriv(c, http.StatusInternalServerError, err)
 		return

storage/upload_model.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"log"
 
-	"git.sp4ke.com/sp4ke/bit4sat-server.git/db"
+	"git.sp4ke.com/sp4ke/bit4sat/db"
 	"github.com/jmoiron/sqlx"
 	"github.com/mattn/go-sqlite3"
 )
@@ -87,7 +87,7 @@ func IdExists(id string) (exists bool, err error) {
 	qUploadExists := `
 		SELECT EXISTS (SELECT upload_id FROM upload where upload_id = ?)
 	`
-	err = DB.Handle.Get(&exists, qUploadExists, id)
+	err = DB.Sql.Get(&exists, qUploadExists, id)
 
 	// No result found is also no result
 	if err == sql.ErrNoRows {
@@ -100,7 +100,7 @@ func IdExists(id string) (exists bool, err error) {
 // Get a file by upload id and hash
 func GetByHashID(sha256 string, id string) (*Upload, error) {
 	var up Upload
-	err := DB.Handle.Get(&up, QGetByHashID, sha256, id)
+	err := DB.Sql.Get(&up, QGetByHashID, sha256, id)
 
 	if err == sql.ErrNoRows {
 		return nil, ErrDoesNotExist
@@ -126,7 +126,9 @@ func (u *Upload) TxSetState(tx *sqlx.Tx, status int) error {
 func (u *Upload) TxWrite(tx *sqlx.Tx) error {
 
 	_, err := tx.NamedExec(QNewUpload, u)
+
 	sqlErr, isSqlErr := err.(sqlite3.Error)
+
 	if isSqlErr && sqlErr.Code == sqlite3.ErrConstraint {
 		return ErrAlreadyExists
 	}
@@ -139,7 +141,7 @@ func (u *Upload) TxWrite(tx *sqlx.Tx) error {
 }
 
 func (u *Upload) Write() error {
-	_, err := DB.Handle.NamedExec(QNewUpload, u)
+	_, err := DB.Sql.NamedExec(QNewUpload, u)
 	sqlErr, isSqlErr := err.(sqlite3.Error)
 	if isSqlErr && sqlErr.Code == sqlite3.ErrConstraint {
 		return ErrAlreadyExists
@@ -153,17 +155,17 @@ func (u *Upload) Write() error {
 }
 
 func init() {
-	_, err := DB.Handle.Exec(DBUploadSchema)
+	_, err := DB.Sql.Exec(DBUploadSchema)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	_, err = DB.Handle.Exec(DBUploadView)
+	_, err = DB.Sql.Exec(DBUploadView)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	_, err = DB.Handle.Exec(DBUploadStatusSchema)
+	_, err = DB.Sql.Exec(DBUploadStatusSchema)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -171,7 +173,7 @@ func init() {
 	// Populate status types
 	query := `INSERT INTO upload_status (type, status) VALUES(?,?)`
 	for k, v := range UploadStatus {
-		_, err := DB.Handle.Exec(query, k, v)
+		_, err := DB.Sql.Exec(query, k, v)
 		if err != nil {
 			sqlErr, ok := err.(sqlite3.Error)
 			if ok && sqlErr.ExtendedCode == sqlite3.ErrConstraintUnique {

web/src/worker.js

@@ -59,7 +59,7 @@ async function newUpload(files){
         postMessage({msg: 'upload-id', id: id})
 
          // Send the files
-         upload.send()
+         //upload.send()
      })
 
 }