[fix] clean after CI/CD Test

[test] CI/CD Test
Router FindByRequestURL() fix
2022-04-05 01:31:50 +02:00 · 2022-04-05 01:30:44 +02:00 · 2022-04-05 01:23:44 +02:00 · 2021-12-18 23:05:08 +01:00 · 2021-11-21 17:12:11 +00:00 · 2021-11-21 18:07:17 +01:00
23 changed files with 2173 additions and 358 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,34 +1,87 @@
+---
 kind: pipeline
 type: docker
-name: default
+name: Code Quality

 steps:
 - name: static_check
-  image: golang:1.16
+  image: golang:1.17
  commands:
-  - go get honnef.co/go/tools/cmd/staticcheck
-  - staticcheck ./pkg/...
+  - go install honnef.co/go/tools/cmd/staticcheck@latest
+  - staticcheck -checks all ./pkg/...
  volumes:
-  - name: gopath
+  - name: env_cache
    path: /go

 - name: lint
-  image: golang:1.16
+  image: golang:1.17
  commands:
-  - go get golang.org/x/lint/golint
+  - go install golang.org/x/lint/golint@latest
  - golint -set_exit_status ./pkg/...
  volumes:
-  - name: gopath
+  - name: env_cache
    path: /go

 - name: vet
-  image: golang:1.16
+  image: golang:1.17
  commands:
  - go vet ./pkg/...
  volumes:
-  - name: gopath
+  - name: env_cache
    path: /go

 volumes:
- name: gopath
-  temp: {}
+- name: env_cache
+  temp: {}
+
+---
+kind: pipeline
+type: docker
+name: Test
+
+steps:
+- name: modules_install
+  image: golang:1.17
+  commands:
+  - go mod tidy && go mod download
+  volumes:
+  - name: env_cache
+    path: /go
+
+- name: build
+  image: golang:1.17
+  commands:
+  - go build -o /tmp/vegvisir pkg/main.go
+  volumes:
+  - name: tmp_cache
+    path: /tmp
+  - name: env_cache
+    path: /go
+
+- name: run
+  image: golang:1.17
+  detach: true
+  commands:
+  - echo $(hostname) >> /tmp/server_hostname
+  - /tmp/vegvisir -c ./vegvisir.test.json
+  volumes:
+  - name: tmp_cache
+    path: /tmp
+
+- name: test
+  image: golang:1.17
+  commands:
+  - while ! ls /tmp/server_hostname; do sleep 1; done
+#  - server_hostname=$(cat /tmp/server_hostname)
+  - curl -fsS http://$(cat /tmp/server_hostname):8080/health | grep OK
+#  - "[ $(curl -fsS http://$server_hostname:8080/health | grep OK | wc -l) = 0 ] && { echo 'Not running.'; return 1; } || { echo 'Vegvisir is running.'; return 0; }"
+  volumes:
+  - name: tmp_cache
+    path: /tmp
+
+volumes:
+- name: env_cache
+  temp: {}
+- name: tmp_cache
+  temp: {}
+
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,6 @@
+.idea
+
 vegvisir.json
 *.prof
+
+*.local*
--- a/3
+++ b/3
@ -1,6 +1,9 @@
 run:
 	go run pkg/main.go

+race:
+	go run --race pkg/main.go
+
 run-profiler:
 	go run pkg/main.go -cpuprofile cpu.prof -memprofile mem.prof

--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -14,8 +14,11 @@ services:
    redis:
        container_name: vegvisir_redis
        image: redis:6.2-alpine
+        volumes:
+            - ./docker/etc/redis.conf:/etc/redis.conf
+        command: "/usr/local/bin/redis-server /etc/redis.conf"
        ports:
-            - 6379:6379
+            - 60379:6379
        networks:
            - vegvisir-network

--- a/docker/etc/redis.conf
+++ b/docker/etc/redis.conf
--- a/go.mod
+++ b/go.mod
@ -1,15 +1,17 @@
-module vegvisir
+module git.pbiernat.dev/golang/vegvisir

-go 1.13
+go 1.17

 require (
-	github.com/andybalholm/brotli v1.0.3 // indirect
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/google/go-cmp v0.5.6 // indirect
-	github.com/klauspost/compress v1.13.1 // indirect
-	github.com/onsi/ginkgo v1.15.0 // indirect
-	github.com/onsi/gomega v1.10.5 // indirect
-	github.com/valyala/fasthttp v1.28.0
-	golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7
+	github.com/valyala/fasthttp v1.31.0
+)
+
+require (
+	github.com/andybalholm/brotli v1.0.2 // indirect
+	github.com/klauspost/compress v1.13.4 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/onsi/gomega v1.17.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,43 +1,51 @@
+github.com/andybalholm/brotli v1.0.2 h1:JKnhI/XQ75uFBTiuzXpzFrUriDPiZjlOSzh6wXogP0E=
 github.com/andybalholm/brotli v1.0.2/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
-github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
-github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
 github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/klauspost/compress v1.13.1 h1:wXr2uRxZTJXHLly6qhJabee5JqIhTRoLBhDOA74hDEQ=
-github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/klauspost/compress v1.13.4 h1:0zhec2I8zGnjWcKyLl6i3gPqKANCCn5e9xmviEEeX6s=
+github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4=
-github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
-github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
+github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 h1:xoIK0ctDddBMnc74udxJYBqlo9Ylnsp1waqjLsnef20=
+github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.28.0 h1:ruVmTmZaBR5i67NqnjvvH5gEv0zwHfWtbjoyW98iho4=
-github.com/valyala/fasthttp v1.28.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA=
+github.com/valyala/fasthttp v1.31.0 h1:lrauRLII19afgCs2fnWRJ4M5IkV0lo2FqA61uGkNBfE=
+github.com/valyala/fasthttp v1.31.0/go.mod h1:2rsYD01CKFrjjsvFxx75KlEUNpWNBY9JWD3K/7o2Cus=
 github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@ -50,8 +58,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed h1:p9UgmWI9wKpfYmgaV/IZKGdXc5qEK45tDwwwDyjS26I=
 golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@ -68,9 +76,8 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 h1:hZR0X1kPW+nwyJ9xRxqZk1vx5RUObAPBdKVvXPDUH/E=
 golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@ -82,20 +89,20 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
--- a/pkg/cache/cache.go
+++ b/pkg/cache/cache.go
@ -7,11 +7,12 @@
 // Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
 // Repo: https://git.pbiernat.dev/golang/vegvisir

+// Package cache whole cache functionality
 package cache

 import (
+	"git.pbiernat.dev/golang/vegvisir/pkg/config"
 	"log"
-	"vegvisir/pkg/config"
 )

 const (
@ -28,12 +29,13 @@ type Datastore interface {
 	IsConnected() bool
 }

-// GetCacheDatastore function
-func GetCacheDatastore(config config.Cache) *Datastore {
+// GetDatastore function
+func GetDatastore(cfg config.Cache) *Datastore {
 	var datastore Datastore

-	if config.Type == typeRedis {
-		datastore = NewRedisDatastore(config.Host, config.Port)
+	log.Printf("Cache datastore type: %s", cfg.Type)
+	if cfg.Type == typeRedis {
+		datastore = NewRedisDatastore(cfg.Host, cfg.Password, cfg.Database, cfg.Port)
 	} else {
 		datastore = NewMemoryDatastore()
 	}
--- a/pkg/cache/manager.go
+++ b/pkg/cache/manager.go
@ -0,0 +1,207 @@
+//           ___   ____               ___       ___
+// \ \  / / | _   |  __| \ \  / / || | __  || || _ |
+//  \ \/ /  |___  | |__   \ \/ /  || |___  || ||___|
+//   \  /   | _   | _  |   \  /   ||  __ | || ||\\
+//    \/    |___  |___ |    \/    || ____| || || \\
+//
+// Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
+// Repo: https://git.pbiernat.dev/golang/vegvisir
+
+// Based on:
+// Package memo provides a concurrency-safe non-blocking memoization
+// of a function.  Requests for different keys proceed in parallel.
+// Concurrent requests for the same url block until the first completes.
+// This implementation uses a monitor goroutine.
+// See page 278.
+
+// Copyright © 2016 Alan A. A. Donovan & Brian W. Kernighan.
+// License: https://creativecommons.org/licenses/by-nc-sa/4.0/
+
+package cache
+
+import (
+	"github.com/pquerna/ffjson/ffjson"
+	"github.com/valyala/fasthttp"
+	"log"
+	"sync"
+	"time"
+)
+
+// Manager main struct
+type Manager struct {
+	sync.RWMutex
+	datastore Datastore
+	prefix    string
+	ttl       int
+	queue     *queue
+}
+
+type result struct {
+	name string         // cache item key
+	body *ResponseCache // cache item body FIXME: use interface to cover all types of cache items
+	err  error
+}
+
+type entry struct {
+	res   result
+	ready chan struct{} // closed when res is ready
+}
+
+// HandlerFunc non-blocking cache handler func signature definition
+type HandlerFunc func(url, method string, route *RouteCache) (*ResponseCache, error)
+
+type queue struct {
+	items chan queueItem
+}
+
+type queueItem struct {
+	url    string
+	method string
+	route  *RouteCache
+	// FIXME: Refactor ^^
+
+	//key      string
+	response chan<- result // the client wants a single result
+}
+
+//var reqsSend = 0
+
+// NewCachedManager Creates instance of non-blocking cache manager
+func NewCachedManager(datastore Datastore, prefix string, ttl int, handler HandlerFunc) *Manager {
+	//log.Printf("Create DS: %s %d", prefix, ttl)
+	m := &Manager{
+		datastore: datastore,
+		prefix:    prefix,
+		ttl:       ttl,
+		queue:     &queue{items: make(chan queueItem)},
+	}
+
+	go m.server(handler)
+
+	return m
+}
+
+// HTTPRequestHandler HTTP Handler for non-blocking cache reads
+func HTTPRequestHandler(url, method string, route *RouteCache) (*ResponseCache, error) { // FIXME: Refactor|Move to handler/
+	//start := time.Now()
+	bckReq := fasthttp.AcquireRequest()
+	bckResp := fasthttp.AcquireResponse()
+	defer fasthttp.ReleaseRequest(bckReq)
+	defer fasthttp.ReleaseResponse(bckResp)
+
+	// copy headers from backend response and prepare request for backend - separate
+	bckReq.SetRequestURI(route.TargetURL)
+	bckReq.Header.SetMethod(method)
+
+	err := fasthttp.Do(bckReq, bckResp)
+	if err != nil {
+		return nil, err
+	}
+
+	body, code := string(bckResp.Body()), bckResp.StatusCode()
+	//log.Printf("%s, %s, %d bytes\n", url, time.Since(start), len(body))
+	// save response to cache
+	respCache := NewResponseCache(url, method, body, code, &bckResp.Header)
+	// ^^ FIXME: rename NewResponseCache(with all depend struct) and move to handler/ (without dependencies)
+
+	//reqsSend++
+	log.Println(time.Now().Nanosecond(), "HTTPRequestHandler() done:", route.TargetURL, url)
+
+	return respCache, nil
+}
+
+// Fetch Non-blocking cache response read
+// FIXME: #68 - refactor
+func (m *Manager) Fetch(url, method string, route *RouteCache) (*ResponseCache, error) {
+	//log.Println("Response CM: Fetch()")
+	response := make(chan result)
+	m.queue.items <- queueItem{url, method, route, response}
+	res := <-response
+
+	return res.body, res.err
+}
+
+// Close exec while server shutting down
+func (m *Manager) Close() {
+	close(m.queue.items)
+}
+
+func (m *Manager) load(url, method string, route *RouteCache /*, output interface{}*/) (bool, *entry) { // FIXME second return type( interface{} )
+	//log.Println("Response CM: load()")
+
+	key := m.prefix + method + "_" + url
+	var data, err = m.datastore.GetKey(key)
+	if err != nil {
+		//log.Println(time.Now().Nanosecond(), "Cache item:", key, "not found")
+
+		return false, &entry{ready: make(chan struct{})}
+	}
+
+	response := &ResponseCache{} // FIXME #67: Simplify
+	jsonErr := ffjson.Unmarshal([]byte(data.(string)), response)
+	if jsonErr != nil {
+		log.Println("Converting error: ", err) // FIXME
+
+		return false, &entry{ready: make(chan struct{})}
+	}
+
+	e := &entry{result{key, response, nil}, make(chan struct{})}
+	close(e.ready)
+
+	return true, e
+}
+
+func (m *Manager) save(name string, r interface{}) bool { // FIXME second argument type( interface{} )
+	//log.Println(time.Now().Nanosecond(), "Saving Response")
+	data, err := ffjson.Marshal(&r)
+	if err != nil {
+		log.Println("JSON:", err) // FIXME
+
+		return false
+	}
+
+	name = m.prefix + name
+	err = m.datastore.SetKey(name, string(data), m.ttl)
+	//log.Printf("%d Saved cache in to ds: %T %s", time.Now().Nanosecond(), m.datastore, name)
+	if err != nil {
+		log.Println("Error saving cache item:", name) // FIXME
+
+		return false
+	}
+
+	return true
+}
+
+// FIXME: #68 - refactor
+// FIXME:
+// 		crashing on https://vps.pbiernat.dev/test-api/news (missing keep-alive header or some http/2 issue...)
+// 		no-errors when Connection: close header is applied on remote
+func (m *Manager) server(handler HandlerFunc) {
+	for item := range m.queue.items {
+		m.Lock()
+		ok, e := m.load(item.url, item.method, item.route /*, &ResponseCache{}*/) // FIXME: &responseCache{} tmp fix
+		m.Unlock()
+		if !ok {
+			//e = &entry{ready: make(chan struct{})/*, called: make(chan struct{})*/}
+			//log.Println("e.call:", item.url, item.method, item.route)
+			go m.call(e, handler, item.url, item.method, item.route)
+		}
+		//log.Println("e.deliver:", item.response)
+		go m.deliver(e, item.response)
+	}
+}
+
+func (m *Manager) call(e *entry, f HandlerFunc, url, method string, route *RouteCache) {
+	e.res.name = method + "_" + url // FIXME: hardcoded key pattern
+	m.RLock()
+	e.res.body, e.res.err = f(url, method, route)
+	m.save(e.res.name, e.res.body)
+	m.RUnlock()
+
+	close(e.ready)
+}
+
+func (m *Manager) deliver(e *entry, response chan<- result) {
+	<-e.ready
+	response <- e.res
+}
--- a/pkg/cache/memory_datastore.go
+++ b/pkg/cache/memory_datastore.go
@ -11,6 +11,7 @@ package cache

 import (
 	"errors"
+	"sync"
 	"time"
 )

@ -32,23 +33,27 @@ func NewMemoryDatastore() *MemoryDatastore {
 type MemoryDatastore struct {
 	cache map[string]interface{}
 	ts    map[string]TTLItem
+	lock  sync.RWMutex
 }

 // SetKey function
 func (ds *MemoryDatastore) SetKey(key string, data interface{}, ttl int) error {
+	ds.lock.Lock()
 	ds.cache[key] = data
 	ds.ts[key] = TTLItem{
 		ts:  time.Now().Second(),
 		ttl: ttl,
 	}
+	ds.lock.Unlock()

 	return nil
 }

 // GetKey function
 func (ds *MemoryDatastore) GetKey(key string) (interface{}, error) {
+	ds.lock.RLock()
+	defer ds.lock.RUnlock()
 	ds.gc(key) // remove key is time of creation is outdated
-
 	if data, ok := ds.cache[key]; ok {
 		return data, nil
 	}
--- a/pkg/cache/redis_datastore.go
+++ b/pkg/cache/redis_datastore.go
@ -10,19 +10,26 @@
 package cache

 import (
+	"github.com/go-redis/redis"
+	"log"
+	"os"
 	"strconv"
 	"time"
-
-	"github.com/go-redis/redis"
 )

 // NewRedisDatastore function
-func NewRedisDatastore(host string, port int) *RedisDatastore {
+func NewRedisDatastore(host, password, db string, port int) *RedisDatastore {
+	dbNum, err := strconv.Atoi(db)
+	if err != nil {
+		log.Println("Config: Invalid redis database!")
+
+		os.Exit(1) // FIXME: move up so in main we use os.Exit ONLY!
+	}
 	return &RedisDatastore{
 		client: redis.NewClient(&redis.Options{
 			Addr:     host + ":" + strconv.Itoa(port),
-			Password: "", // FIXME: use env or param
-			DB:       0,  // FIXME: use env or param
+			Password: password,
+			DB:       dbNum,
 		}),
 	}
 }
--- a/pkg/cache/response.go
+++ b/pkg/cache/response.go
@ -9,10 +9,7 @@

 package cache

-import (
-	"encoding/json"
-	"log"
-)
+import "github.com/valyala/fasthttp"

 // Headers type
 type Headers map[string]string
@ -20,68 +17,21 @@ type Headers map[string]string
 // ResponseCache struct
 type ResponseCache struct {
 	URL     string
+	Method  string
 	Body    string
-	Headers Headers
+	Code    int
+	Headers *fasthttp.ResponseHeader
 }

-// ResponseCacheManager class
-type ResponseCacheManager struct {
-	datastore Datastore
-	prefix    string
-	ttl       int
+// NewResponseCache Creates new ResponseCache structure
+func NewResponseCache(url, method, body string, code int, headers *fasthttp.ResponseHeader) *ResponseCache {
+	return &ResponseCache{url, method, body, code, headers}
 }

-// NewResponseCacheManager function
-func NewResponseCacheManager(datastore Datastore, ttl int) ResponseCacheManager {
-	return ResponseCacheManager{
-		datastore: datastore,
-		prefix:    "response_",
-		ttl:       ttl,
-	}
-}
-
-// Save function
-func (rm *ResponseCacheManager) Save(name string, r ResponseCache) bool {
-	if !rm.datastore.IsConnected() {
-		log.Println("Response-cache:", "Not connected to server")
-		return false
-	}
-
-	data, err := json.Marshal(r)
-	if err != nil {
-		log.Println("Response-cache", "JSON encode:", err)
-		return false
-	}
-
-	name = rm.prefix + name
-	err = rm.datastore.SetKey(name, string(data), rm.ttl)
-	if err != nil {
-		log.Println("Response-cache:", err, name)
-		return false
-	}
-
-	return true
-}
-
-// Load function
-func (rm *ResponseCacheManager) Load(name string) (bool, *ResponseCache) {
-	if !rm.datastore.IsConnected() {
-		log.Println("Response-cache:", "Not connected to server")
-		return false, &ResponseCache{}
-	}
-
-	name = rm.prefix + name
-	data, err := rm.datastore.GetKey(name)
-	if err != nil {
-		return false, &ResponseCache{}
-	}
-
-	rc := &ResponseCache{}
-	err = json.Unmarshal([]byte(data.(string)), &rc)
-	if err != nil {
-		log.Println("Response-cache:", "JSON docode:", err)
-		return false, &ResponseCache{}
-	}
-
-	return true, rc
-}
+//func (r *ResponseCache) StatusCode() int {
+//	return r.Code
+//}
+//
+//func (r *ResponseCache) Body() []byte {
+//	return r.Body
+//}
--- a/pkg/cache/route.go
+++ b/pkg/cache/route.go
@ -9,76 +9,16 @@

 package cache

-import (
-	"encoding/json"
-	"log"
-)
-
-// RouteCache struct
+// RouteCache struct corresponding route cache item
 type RouteCache struct {
 	SourceURL string
 	TargetURL string
 }

-// RouteCacheManager class
-type RouteCacheManager struct {
-	datastore Datastore
-	prefix    string
-	ttl       int
-}
-
-// NewRouteCacheManager function
-func NewRouteCacheManager(datastore Datastore, ttl int) RouteCacheManager {
-	return RouteCacheManager{
-		datastore: datastore,
-		prefix:    "route_",
-		ttl:       ttl,
+// NewRouteCache Creates new router instance
+func NewRouteCache(source, target string) *RouteCache {
+	return &RouteCache{
+		SourceURL: source,
+		TargetURL: target,
 	}
 }
-
-// Save function
-func (rm *RouteCacheManager) Save(name string, r RouteCache) bool {
-	if !rm.datastore.IsConnected() {
-		log.Println("Route-cache:", "Not connected to server")
-		return false
-	}
-
-	data, err := json.Marshal(r)
-	if err != nil {
-		log.Println("Route-cache", "JSON encode:", err)
-		return false
-	}
-
-	name = rm.prefix + name
-	err = rm.datastore.SetKey(name, data, rm.ttl)
-	if err != nil {
-		log.Println("Route-cache:", "Unable to save", name, err)
-		return false
-	}
-
-	return true
-}
-
-// Load function
-func (rm *RouteCacheManager) Load(name string) (bool, *RouteCache) {
-	if !rm.datastore.IsConnected() {
-		log.Println("Route-cache:", "Not connected to server")
-		return false, &RouteCache{}
-	}
-
-	name = rm.prefix + name
-	data, err := rm.datastore.GetKey(name)
-	if err != nil {
-		log.Println("Route-cache:", "Unable to load", name, err)
-		return false, &RouteCache{}
-	}
-
-	rc := &RouteCache{}
-	err = json.Unmarshal([]byte(data.(string)), &rc)
-	if err != nil {
-		log.Println("Route-cache:", "JSON decode:", err)
-		return false, &RouteCache{}
-	}
-
-	return true, rc
-}
--- a/pkg/client/http.go
+++ b/pkg/client/http.go
@ -7,6 +7,7 @@
 // Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
 // Repo: https://git.pbiernat.dev/golang/vegvisir

+// Package client all available clients lives here (httpo, https, grpc etc.)
 package client

 import "github.com/valyala/fasthttp"
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@ -7,6 +7,7 @@
 // Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
 // Repo: https://git.pbiernat.dev/golang/vegvisir

+// Package config main config file structs
 package config

 import (
--- a/pkg/handler/handler.go
+++ b/pkg/handler/handler.go
@ -7,4 +7,5 @@
 // Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
 // Repo: https://git.pbiernat.dev/golang/vegvisir

+// Package handler all handlers will be placed here in future...
 package handler
--- a/pkg/handler/http.go
+++ b/pkg/handler/http.go
@ -0,0 +1,44 @@
+//           ___   ____               ___       ___
+// \ \  / / | _   |  __| \ \  / / || | __  || || _ |
+//  \ \/ /  |___  | |__   \ \/ /  || |___  || ||___|
+//   \  /   | _   | _  |   \  /   ||  __ | || ||\\
+//    \/    |___  |___ |    \/    || ____| || || \\
+//
+// Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
+// Repo: https://git.pbiernat.dev/golang/vegvisir
+
+// Package handler contain handlers for various protocols
+package handler
+
+//func (s *Server) httpHandler(ctx *fasthttp.RequestCtx) {
+//	// http := client.NewHttpClient(ctx)
+//
+//	// move all below logic to concrete handler or sth....
+//	reqURL, sReqURL, sReqMethod := ctx.RequestURI(), string(ctx.RequestURI()), string(ctx.Method())
+//	//log.Println("Incoming request:", sReqMethod, sReqURL)
+//
+//	found, route := s.router.FindByRequestURL(reqURL)
+//	if !found {
+//		// FIXME: return 404 or 5xx error in response? Maybe define it in concrete Backend config?
+//		ctx.SetStatusCode(fasthttp.StatusNotFound)
+//		//ctx.SetConnectionClose()
+//
+//		log.Println("404:", sReqMethod, sReqURL)
+//		return
+//	}
+//
+//	response, err := s.respCM.Fetch(sReqURL, sReqMethod, route)
+//	if err != nil {
+//		// FIXME: Response read error(sending 500 error response)
+//		ctx.SetStatusCode(fasthttp.StatusInternalServerError)
+//		//ctx.SetConnectionClose() // not sure if change abything with connection: keep-alive/close issue ^^
+//
+//		log.Println("Response read error(sending 500 error response)", err)
+//		return
+//	}
+//
+//	ctx.Response.Header.SetBytesV(fasthttp.HeaderContentType, response.Headers.ContentType())
+//	ctx.SetStatusCode(response.Code)
+//	ctx.SetBodyString(response.Body)
+//	//ctx.SetConnectionClose()
+//}
--- a/pkg/main.go
+++ b/pkg/main.go
@ -11,11 +11,13 @@ package main

 import (
 	"flag"
+	"git.pbiernat.dev/golang/vegvisir/pkg/server"
 	"log"
+	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"runtime"
 	"runtime/pprof"
-	"vegvisir/pkg/server"
 )

 var (
@ -26,6 +28,10 @@ var (
 )

 func main() {
+	go func() {
+		log.Println(http.ListenAndServe("localhost:6060", nil))
+	}()
+
 	flag.Parse()
 	// cpu profiling
 	if *cpuprofile != "" {
--- a/pkg/server/router.go
+++ b/pkg/server/router.go
@ -1,3 +1,4 @@
+
 //           ___   ____               ___       ___
 // \ \  / / | _   |  __| \ \  / / || | __  || || _ |
 //  \ \/ /  |___  | |__   \ \/ /  || |___  || ||___|
@ -11,37 +12,39 @@ package server

 import (
 	"fmt"
+	"git.pbiernat.dev/golang/vegvisir/pkg/cache"
+	"git.pbiernat.dev/golang/vegvisir/pkg/config"
+	"log"
 	"regexp"
 	"strings"
-	"vegvisir/pkg/cache"
-	"vegvisir/pkg/config"
 )

 // Router struct
 type Router struct {
 	config *config.Config
-	rcm    cache.RouteCacheManager     // Redis cache
-	rCache map[string]cache.RouteCache // Internal route cache - TMP?
-}
-
-// Route struct
-type Route struct {
-	SourceURL string
-	TargetURL string
+	cache  *cache.MemoryDatastore
 }

 // NewRouter function
-func NewRouter(conf *config.Config, cacheDS cache.Datastore, ttl int) *Router {
+func NewRouter(config *config.Config, ds *cache.MemoryDatastore, ttl int) *Router {
 	return &Router{
-		config: conf,
-		rcm:    cache.NewRouteCacheManager(cacheDS, ttl),
-		rCache: make(map[string]cache.RouteCache),
+		config: config,
+		cache:  ds,
+		//cache: cache.NewRedisDatastore(config.Cache.Host, config.Cache.Password, config.Cache.Database, config.Cache.Port),
 	}
 }

 // FindByRequestURL function
-func (r *Router) FindByRequestURL(url []byte) (bool, Route) {
-	var sURL string = string(url)
+func (r *Router) FindByRequestURL(url []byte) (bool, *cache.RouteCache) {
+	var sURL = string(url)
+
+	//if cRoute, ok := r.cache[sURL]; ok {
+	if cRoute, err := r.cache.GetKey("route_" + sURL); err == nil {
+		return true, cRoute.(*cache.RouteCache)
+		//response := &cache.RouteCache{} // FIXME #67: Simplify
+		//ffjson.Unmarshal([]byte(cRoute.(string)), response)
+		//return true, response // FIXME: redis cache tmp
+	}

 	for bID := range r.config.Backends {
 		bck := r.config.Backends[bID]
@ -50,38 +53,25 @@ func (r *Router) FindByRequestURL(url []byte) (bool, Route) {
 		}

 		for rID := range bck.Routes {
-			routeCfg := &bck.Routes[rID]
+			rCfg := &bck.Routes[rID]

-			// if ok, cRoute := s.rCacheManager.Load(sUri); ok {
-			// 	return true, cRoute
-			// }
-			if cRoute, ok := r.rCache[sURL]; ok {
-				route := Route{
-					SourceURL: cRoute.SourceURL,
-					TargetURL: cRoute.TargetURL,
-				}
-				return true, route
-			}
-
-			rgxp := regexp.MustCompile(fmt.Sprintf("%s%s", bck.PrefixURL, routeCfg.Pattern))
-			if rgxp.Match(url) {
-				targetURL := bck.BackendAddress + rgxp.ReplaceAllString(sURL, routeCfg.Target)
-
-				route := Route{ // FIXME: duplicated #1
-					SourceURL: sURL,
-					TargetURL: targetURL,
-				}
-
-				// s.rCacheManager.Save(sUri, cRoute)
-				r.rCache[sURL] = cache.RouteCache{ // FIXME: duplicated #1
-					SourceURL: route.SourceURL,
-					TargetURL: route.TargetURL,
+			regxp := regexp.MustCompile(fmt.Sprintf("%s%s", bck.PrefixURL, rCfg.Pattern))
+			if regxp.Match(url) {
+				tURL := bck.BackendAddress + regxp.ReplaceAllString(sURL, rCfg.Target)
+				route := cache.NewRouteCache(sURL, tURL)
+
+				//routeJSON, _ := ffjson.Marshal(&route) // FIXME: TMP
+
+				if err := r.cache.SetKey("route_"+sURL, route, r.config.Cache.RouteTTL); err != nil {
+					// FIXME: ^^ use cache.Manager* after refactor
+					log.Println("Error saving route cache:", sURL)
 				}
+				log.Println("Saved route:", sURL, route.TargetURL)

 				return true, route
 			}
 		}
 	}

-	return false, Route{}
+	return false, &cache.RouteCache{}
 }
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@ -7,20 +7,21 @@
 // Copyright (c) 2021 Piotr Biernat. https://pbiernat.dev. MIT License
 // Repo: https://git.pbiernat.dev/golang/vegvisir

+// Package server contains main sever files
 package server

 import (
 	"context"
 	"fmt"
+	"git.pbiernat.dev/golang/vegvisir/pkg/cache"
+	"git.pbiernat.dev/golang/vegvisir/pkg/config"
+	"github.com/valyala/fasthttp"
 	"log"
 	"os"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
-	"vegvisir/pkg/cache"
-	"vegvisir/pkg/config"
-
-	"github.com/valyala/fasthttp"
 )

 const (
@ -34,45 +35,56 @@ const (
 type Server struct {
 	config *config.Config
 	router *Router
-	respCM cache.ResponseCacheManager // Redis response cache
+	respCM *cache.Manager
+	daemon *fasthttp.Server
 }

 // NewServer function
 func NewServer(cPath string) *Server {
-	config := config.New(cPath)
+	cfg := config.New(cPath)

-	if err := config.Load(); err != nil {
+	if err := cfg.Load(); err != nil {
 		log.Fatalln("Unable to find config file: ", cPath, err)
 	}

-	datastore := cache.GetCacheDatastore(config.Cache)
+	datastore := cache.GetDatastore(cfg.Cache)

 	return &Server{
-		config: config,
-		router: NewRouter(config, *datastore, config.Cache.RouteTTL),
-		respCM: cache.NewResponseCacheManager(*datastore, config.Cache.ResponseTTL),
+		config: cfg,
+		router: NewRouter(cfg, cache.NewMemoryDatastore(), cfg.Cache.RouteTTL),
+		// ^^ INFO: Routes always use memoryCache cause low size and fast read time (optimalization)
+		respCM: cache.NewCachedManager(*datastore, "response_", cfg.Cache.ResponseTTL, cache.HTTPRequestHandler),
+		// ^^ FIXME: add handler detection option by config etc...
 	}
 }

 // Run function
 func (s *Server) Run() {
+	//s.memo = cache.New(s.processUrl)
+
+	log.Println("Starting server...")
 	go func() {
 		serverAddress := s.config.Server.Address + ":" + fmt.Sprint(s.config.Server.Port)
-		if err := fasthttp.ListenAndServe(serverAddress, s.mainHandler); err != nil {
+		s.daemon = &fasthttp.Server{
+			Handler:            s.mainHandler,
+			ReadTimeout:        15 * time.Second,
+			WriteTimeout:       20 * time.Second,
+			MaxConnsPerIP:      500,
+			MaxRequestsPerConn: 500,
+			IdleTimeout:        15 * time.Second, // aka KeepAlive
+			//CloseOnShutdown: true,
+		}
+
+		if err := s.daemon.ListenAndServe(serverAddress); err != nil {
 			log.Fatalf("Server panic! Error message: %s", err)
 		}
 	}()

-	log.Println("Server started")
-
-	// Wait for an interrupt
+	// Wait for an interrupt and attempt a graceful shutdown
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt, syscall.SIGTERM)
 	<-interrupt
-
 	log.Println("SIGKILL or SIGINT caught, shutting down...")
-
-	// Attempt a graceful shutdown
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

@ -82,7 +94,10 @@ func (s *Server) Run() {

 // Shutdown function
 func (s *Server) Shutdown(ctx context.Context) { // TODO: wait for all connections to finish
-	log.Println("Shuting down...")
+	//defer s.respCM.Close()
+	//defer s.daemon.Shutdown()
+
+	log.Println("Shutting down...")
 }

 func (s *Server) mainHandler(ctx *fasthttp.RequestCtx) {
@ -90,64 +105,38 @@ func (s *Server) mainHandler(ctx *fasthttp.RequestCtx) {

 	// move all below logic to concrete handler or sth....
 	reqURL, sReqURL, sReqMethod := ctx.RequestURI(), string(ctx.RequestURI()), string(ctx.Method())
-	// log.Println("Incoming request:", sReqMethod, sReqURL)
+	log.Println("Incoming request:", sReqMethod, sReqURL)
+
+	if strings.Contains(sReqURL, "/health") { // quick and tmp fix, hack...
+		ctx.SetStatusCode(fasthttp.StatusOK)
+		ctx.SetContentType("application/json")
+		ctx.SetBodyString("{\"health\":\"OK\"}")

-	found, route := s.router.FindByRequestURL(reqURL)
-	if !found {
-		// FIXME: return 404/5xx error in repsonse, maybe define it in Backend config?
-		ctx.SetStatusCode(fasthttp.StatusNotFound)
 		return
 	}

-	go func() {
-		cacheFound, data := s.respCM.Load(sReqURL)
-		if cacheFound { // get response from cache
-			// log.Println("Read resp from cache: ", route.TargetUrl)
+	found, route := s.router.FindByRequestURL(reqURL)
+	if !found {
+		// FIXME: return 404 or 5xx error in response? Maybe define it in concrete Backend config?
+		ctx.SetStatusCode(fasthttp.StatusNotFound)
+		//ctx.SetConnectionClose()

-			// copy headers and body from cache
-			ctx.Response.Header.DisableNormalizing()
-			for key, value := range data.Headers {
-				ctx.Response.Header.Set(key, value)
-			}
-			ctx.SetBody([]byte(data.Body))
-		} else { // send request to backend and save to cache
-			log.Println("Send req to backend url: ", route.TargetURL)
+		log.Println("404:", sReqMethod, sReqURL)
+		return
+	}

-			// prepare to send request to backend - separate
-			bckReq := fasthttp.AcquireRequest()
-			bckResp := fasthttp.AcquireResponse()
-			defer fasthttp.ReleaseRequest(bckReq)
-			defer fasthttp.ReleaseResponse(bckResp)
+	response, err := s.respCM.Fetch(sReqURL, sReqMethod, route)
+	if err != nil {
+		// FIXME: Response read error(sending 500 error response)
+		ctx.SetStatusCode(fasthttp.StatusInternalServerError)
+		//ctx.SetConnectionClose() // not sure if change abything with connection: keep-alive/close issue ^^

-			// copy headers from backend response and prepare request for backend - separate
-			bckReq.SetRequestURI(route.TargetURL)
-			bckReq.Header.SetMethod(sReqMethod)
+		log.Println("Response read error(sending 500 error response)", err)
+		return
+	}

-			err := fasthttp.Do(bckReq, bckResp)
-			if err != nil {
-				ctx.SetStatusCode(fasthttp.StatusInternalServerError)
-				return
-			}
-
-			headers := make(cache.Headers)
-			// rewrite headers from backend to gateway response
-			bckResp.Header.Set(fasthttp.HeaderServer, ServerName)
-			bckResp.Header.Del(fasthttp.HeaderXPoweredBy)
-			ctx.Response.Header.DisableNormalizing()
-			bckResp.Header.VisitAll(func(key, value []byte) {
-				headers[string(key)] = string(value)
-				ctx.Response.Header.SetBytesKV(key, value)
-			})
-			// ctx.SetStatusCode(bckResp.StatusCode())
-			ctx.SetBody(bckResp.Body())
-
-			// save response to cache
-			respCache := cache.ResponseCache{
-				URL:     sReqURL,
-				Body:    string(bckResp.Body()),
-				Headers: headers,
-			} // FIXME: prepare resp cache struct in respCM.Save method or other service...
-			s.respCM.Save(sReqURL, respCache)
-		}
-	}()
+	ctx.Response.Header.SetBytesV(fasthttp.HeaderContentType, response.Headers.ContentType())
+	ctx.SetStatusCode(response.Code)
+	ctx.SetBodyString(response.Body)
+	//ctx.SetConnectionClose()
 }
--- a/vegvisir.json
+++ b/vegvisir.json
@ -1,43 +0,0 @@
-{
-    "server": {
-        "address": "127.0.0.1",
-        "port": 8080
-    },
-    "backends": {
-        "news-app": {
-            "prefixURL": "news/",
-            "backendAddress": "http://172.17.0.1:3030",
-            "routes": [{
-                "pattern": "new/(.*)/([0-9]*)",
-                "target": "new-url/$1/$2"
-            },{
-                "pattern": "new/(.*)",
-                "target": "$1"
-            },{
-                "pattern": "(.+)",
-                "target": "url"
-            }]
-        },
-        "article-app": {
-            "prefixURL": "art/",
-            "backendAddress": "http://172.17.0.1:3030",
-            "routes": [{
-                "pattern": "art1/(.*)",
-                "target": "art-url/$1"
-            },{
-                "pattern": "([a-zA-Z0-9]*)",
-                "target": "art-global/$1"
-            }]
-        }
-    },
-    "cache": {
-        "type": "redis",
-        "host": "localhost",
-        "port": 6379,
-        "username": "",
-        "password": "",
-        "database": "0",
-        "routeTTL": 10,
-        "responseTTL": 10
-    }
-}
--- a/vegvisir.json.dist
+++ b/vegvisir.json.dist
@ -6,27 +6,21 @@
    "backends": {
        "news-app": {
            "prefixURL": "news/",
-            "backendAddress": "http://127.0.0.1:3030",
+            "backendAddress": "http://172.17.0.1:3030/api/news",
            "routes": [{
-                "pattern": "new/(.*)",
-                "target": "$1"
+                "pattern": "archive/([0-9]*)",
+                "target": "archive/$1"
            },{
-                "pattern": "new1/(.*)/([0-9]*)",
-                "target": "new-url1/$1/$2"
-            },{
-                "pattern": "(.+)",
-                "target": "url"
+                "pattern": "(.*)",
+                "target": "new/$1"
            }]
        },
        "article-app": {
            "prefixURL": "art/",
-            "backendAddress": "http://127.0.0.1:3030",
+            "backendAddress": "http://172.17.0.1:3030/api/articles",
            "routes": [{
-                "pattern": "art1/(.*)",
-                "target": "art-url1/$1"
-            },{
-                "pattern": "([a-zA-Z0-9]*)",
-                "target": "article-global/$1"
+                "pattern": "(.*)",
+                "target": "$1"
            }]
        }
    },
@ -37,7 +31,7 @@
        "username": "",
        "password": "",
        "database": "0",
-        "routeTTL": 300,
-        "responseTTL": 300
+        "routeTTL": 10,
+        "responseTTL": 5
    }
 }
--- a/vegvisir.test.json
+++ b/vegvisir.test.json
@ -0,0 +1,19 @@
+{
+    "server": {
+        "address": "0.0.0.0",
+        "port": 8080
+    },
+    "backends": {
+        "news-app": {
+            "prefixURL": "/",
+            "backendAddress": "http://127.0.0.1:3030/api/news",
+            "routes": [{
+                "pattern": "(.*)",
+                "target": "$1"
+            }]
+        }
+    },
+    "cache": {
+        "type": "memory"
+    }
+}
Author	SHA1	Message	Date
Piotr Biernat	9c3ff8fd9a	[fix] clean after CI/CD Test All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-05 01:31:50 +02:00
Piotr Biernat	54905417d3	[test] CI/CD Test All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-05 01:30:44 +02:00
Piotr Biernat	6392d7088e	Router FindByRequestURL() fix All checks were successful continuous-integration/drone/push Build is passing Details	2022-04-05 01:23:44 +02:00
Piotr Biernat	a27cc0624a	Docker redis port update	2021-12-18 23:05:08 +01:00
Piotr Biernat	d151907f8f	Simplified .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-21 17:12:11 +00:00
Piotr Biernat	a1682660bd	[fix] Simplified checking service is alive All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-21 18:07:17 +01:00
Piotr Biernat	eeaf6e75e8	[feature] Added new pipeline. Build and check is server starting up	2021-11-21 14:13:21 +01:00
Piotr Biernat	a19be84c4b	[feature] Added detach mode to .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-20 17:32:05 +01:00
Piotr Biernat	51f6cf8569	Merge branch 'develop-memo-cache' of git.pbiernat.dev:golang/vegvisir into develop-memo-cache All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-20 17:18:01 +01:00
Piotr Biernat	7bb7417f3a	[fix] Fixed all linters warnings All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-15 21:47:25 +01:00
Piotr Biernat	f2292ef8fb	[fix] Updated .drone.yml config Some checks failed continuous-integration/drone/push Build is failing Details	2021-11-15 20:59:13 +01:00
Piotr Biernat	92fb8356f1	[fix] Changed module name	2021-11-15 20:19:41 +01:00
Piotr Biernat	8a4429cb3f	[fix] Better usage of goroutines - beta	2021-11-15 20:17:52 +01:00
Piotr Biernat	d651571a55	tmp goroutines cache Some checks failed continuous-integration/drone/push Build is failing Details	2021-11-12 20:11:56 +01:00