Various updates

Author: Jasper Berghoef

Dockerfile

@@ -1,9 +1,13 @@
-FROM golang:1.9.2
+FROM golang:1.10.3
+
+ENV PROTOCOL=https
+ENV ORIGIN=www.example.com
 
 WORKDIR /go/src/app
 COPY . .
 
-RUN go-wrapper download
-RUN go-wrapper install
+RUN go get -d -v ./...
+RUN go install -v ./...
+RUN go build .
 
-CMD ["go-wrapper", "run"]
+CMD ["app"]

Gopkg.lock

@@ -0,0 +1,42 @@
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#   name = "github.com/x/y"
+#   version = "2.4.0"
+#
+# [prune]
+#   non-go = false
+#   go-tests = true
+#   unused-packages = true
+
+
+[[constraint]]
+  name = "github.com/boltdb/bolt"
+  version = "1.3.1"
+
+[[constraint]]
+  name = "github.com/carlescere/scheduler"
+  version = "0.1.0"
+
+[[constraint]]
+  name = "gopkg.in/kyokomi/emoji.v1"
+  version = "1.5.1"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.toml

@@ -1,7 +1,7 @@
 all: reset install test build
 
 build:
-	go build *.go
+	go build -o gocdn *.go
 
 test:
 	go test -v
@@ -10,8 +10,7 @@ reset:
 	rm -rf cache cache.db
 
 install:
-	go get -d -v
-	go install -v
+	dep ensure
 
 docker_build:
 	docker build -t gocdn .

Makefile

@@ -8,10 +8,11 @@ import (
 	"os"
 	"path/filepath"
 
+	"encoding/json"
+
 	"github.com/boltdb/bolt"
 	"github.com/carlescere/scheduler"
 	emoji "gopkg.in/kyokomi/emoji.v1"
-	"encoding/json"
 )
 
 var protocol = flag.String("protocol", "", "The protocol used by your website.")
@@ -92,19 +93,30 @@ func init() {
 			return
 		}
 	}
-}
 
-/* main
-Spins up the awesomeness.
-================================================================================ */
-func main() {
 	flag.Parse()
 
+	if *protocol == "" {
+		*protocol = os.Getenv("PROTOCOL")
+	}
+
+	if *origin == "" {
+		*origin = os.Getenv("ORIGIN")
+	}
+
 	if *protocol == "" || *origin == "" {
-		fmt.Println("Please provide a protocol and origin.\nUse '--help' for more information.")
+		fmt.Println(`
+			Please provide a protocol and origin.\n
+			Use '--help' for more information.
+		`)
 		return
 	}
+}
 
+/* main
+Spins up the awesomeness.
+================================================================================ */
+func main() {
 	// Open database
 	var err error
 	db, err = bolt.Open("cache.db", 0600, nil)
@@ -121,10 +133,14 @@ func main() {
 		return nil
 	})
 
+	scheduler.Every(5).Minutes().Run(cleanCache)
+
 	// Start HTTP server
 	http.HandleFunc("/", requestHandler)
 
-	switch{
+	fmt.Println("Listening on port", ":8080")
+
+	switch {
 	case *protocol == "http":
 		http.ListenAndServe(":8080", nil)
 	case *protocol == "https":

cdn.go

@@ -60,7 +60,7 @@ func verifyAndRetrieveFile(localFile string, originURL string) {
 					}
 
 					relPath, _ := filepath.Rel(cacheDir, localFile)
-					emoji.Println("\t:truck: Retreiving file:", originURL, "\n\t:memo: Writing", n, "bytes to", relPath)
+					emoji.Println("\t:truck: Retrieving file:", originURL, "\n\t:memo: Writing", n, "bytes to", relPath)
 
 					go registerFileToDb(originURL, relPath, maxAge, revalidate, response.Header)