diff --git a/.dockerignore b/.dockerignore
index cd6aad45c556649e2f13640cbb6678825e5ed7d6..7fb2af62aeb6b21eaa690325a8e904bbadc4ee79 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
/Makefile
-/Dockerfile
/.gitlab-ci.yml
/.gitignore
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de3af6cf386723523401061601451beb3ec52943..84648e6a0b1c98ad8df48001e40f0a284e42bed2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,18 @@
-build:
+backend:
stage: build
image:
name: gcr.io/kaniko-project/executor:debug
- entrypoint: [""]
+ entrypoint: [ "" ]
script:
- mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:latest
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/backend/Dockerfile --destination $CI_REGISTRY_IMAGE:backend-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:backend
+frontend:
+ stage: build
+ image:
+ name: gcr.io/kaniko-project/executor:debug
+ entrypoint: [ "" ]
+ script:
+ - mkdir -p /kaniko/.docker
+ - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+ - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/frontend/Dockerfile --destination $CI_REGISTRY_IMAGE:frontend-${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA} --destination $CI_REGISTRY_IMAGE:frontend
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d6978b1f16f2516fd9b136b2e9bb5794128127f4..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-IMAGE := k8r.eu/justjanne/$(shell basename $(shell git remote get-url origin) .git)
-TAGS := $(shell git describe --always --tags HEAD)
-
-.PHONY: build
-build:
- docker build --pull -t $(IMAGE):$(TAGS) .
- docker tag $(IMAGE):$(TAGS) $(IMAGE):latest
- @echo Successfully tagged $(IMAGE):$(TAGS) as latest
-
-.PHONY: push
-push: build
- docker push $(IMAGE):$(TAGS)
- docker push $(IMAGE):latest
- @echo Successfully pushed $(IMAGE):$(TAGS) as latest
-
-.PHONY: tags
-tags:
- @echo "$(TAGS)"
diff --git a/backend/Dockerfile b/backend/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..daf7ce96122a37583d7d14fd3c35d6c4d0fbafa3
--- /dev/null
+++ b/backend/Dockerfile
@@ -0,0 +1,29 @@
+FROM golang:1.17-alpine3.15 AS builder
+
+RUN apk --no-cache add \
+ --virtual .build-deps \
+ alpine-sdk \
+ cmake \
+ sudo \
+ libssh2 libssh2-dev \
+ git \
+ dep \
+ bash \
+ curl \
+ imagemagick \
+ imagemagick-dev
+
+WORKDIR /go/src/app
+COPY go.* ./
+RUN go mod download
+COPY *.go ./
+RUN go build -o app backend
+
+FROM alpine:3.15
+
+RUN apk --no-cache add imagemagick
+RUN addgroup -g 1000 -S app && \
+ adduser -u 1000 -G app -S app
+COPY --from=builder /go/src/app /
+USER app
+ENTRYPOINT ["/app"]
diff --git a/backend/goroutine.go b/backend/goroutine.go
new file mode 100644
index 0000000000000000000000000000000000000000..ebd0432bdfc8ce58d633598e7ef5759fda8cb4ee
--- /dev/null
+++ b/backend/goroutine.go
@@ -0,0 +1,22 @@
+package main
+
+func readAllErrors(amount int, errorChannel chan error) []error {
+ errors := make([]error, 0)
+ for i := 0; i < amount; i++ {
+ err := <-errorChannel
+ if err != nil {
+ errors = append(errors, err)
+ }
+ }
+
+ return errors
+}
+
+func runMany(amount int, function func(index int) error) []error {
+ errorChannel := make(chan error)
+ for i := 0; i < amount; i++ {
+ index := i
+ go func() { errorChannel <- function(index) }()
+ }
+ return readAllErrors(amount, errorChannel)
+}
diff --git a/backend/main.go b/backend/main.go
new file mode 100644
index 0000000000000000000000000000000000000000..f7e8a0fe1bfa562fcbb3b5b160e77b2f7700b9a7
--- /dev/null
+++ b/backend/main.go
@@ -0,0 +1,77 @@
+package main
+
+import (
+ "context"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
+ "github.com/hibiken/asynq"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/client_golang/prometheus/promauto"
+ "github.com/prometheus/client_golang/prometheus/promhttp"
+ "golang.org/x/sys/unix"
+ "gopkg.in/gographics/imagick.v3/imagick"
+ "log"
+ "net/http"
+ "os"
+ "os/signal"
+)
+
+var imageProcessDuration = promauto.NewCounterVec(prometheus.CounterOpts{
+ Name: "imghost_process_duration",
+ Help: "The amount of time spent processing images",
+}, []string{"task"})
+var imageProcessDurationRead = imageProcessDuration.WithLabelValues("read")
+var imageProcessDurationClone = imageProcessDuration.WithLabelValues("clone")
+var imageProcessDurationCrop = imageProcessDuration.WithLabelValues("crop")
+var imageProcessDurationResize = imageProcessDuration.WithLabelValues("resize")
+var imageProcessDurationWrite = imageProcessDuration.WithLabelValues("write")
+
+func main() {
+ configFile, err := os.Open("config.yaml")
+ if err != nil {
+ log.Fatalf("Could not open config file: %s", err.Error())
+ }
+ config := shared.LoadConfigFromFile(configFile)
+
+ imagick.Initialize()
+ defer imagick.Terminate()
+
+ srv := asynq.NewServer(
+ config.AsynqOpts(),
+ asynq.Config{Concurrency: config.Concurrency},
+ )
+
+ mux := asynq.NewServeMux()
+ mux.HandleFunc(shared.TypeImageResize, ProcessImageHandler(&config))
+
+ metricsMux := http.NewServeMux()
+ metricsMux.Handle("/metrics", promhttp.Handler())
+ metricsMux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
+ _, _ = w.Write([]byte("OK"))
+ })
+ metrics := &http.Server{
+ Addr: ":2112",
+ Handler: metricsMux,
+ }
+
+ done := make(chan struct{})
+ go func() {
+ if err := metrics.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+ log.Printf("Error: metrics server error: %s", err.Error())
+ }
+ close(done)
+ }()
+
+ if err := srv.Run(mux); err != nil {
+ log.Fatal(err)
+ }
+
+ sigs := make(chan os.Signal, 1)
+ signal.Notify(sigs, unix.SIGTERM, unix.SIGINT)
+ <-sigs
+
+ srv.Shutdown()
+ if err := metrics.Shutdown(context.Background()); err != nil {
+ log.Printf("Error: metrics shutdown error: %s", err.Error())
+ }
+ <-done
+}
diff --git a/backend/process.go b/backend/process.go
new file mode 100644
index 0000000000000000000000000000000000000000..1923f54d62c689c3300b5f537066eb01f1841a42
--- /dev/null
+++ b/backend/process.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
+ "github.com/hibiken/asynq"
+ "github.com/prometheus/client_golang/prometheus"
+ "os"
+ "path/filepath"
+ "strings"
+ "time"
+)
+
+func trackTimeSince(counter prometheus.Counter, start time.Time) time.Time {
+ now := time.Now().UTC()
+ counter.Add(float64(now.Sub(start).Milliseconds()) / 1000.0)
+ return now
+}
+
+func ProcessImageHandler(config *shared.Config) asynq.HandlerFunc {
+ return func(ctx context.Context, t *asynq.Task) error {
+ task := shared.ImageTaskPayload{}
+ if err := json.Unmarshal(t.Payload(), &task); err != nil {
+ return err
+ }
+
+ errors := ResizeImage(config, task.ImageId)
+ _ = os.Remove(filepath.Join(config.SourceFolder, task.ImageId))
+
+ errorMessages := make([]string, len(errors))
+ for i, err := range errors {
+ errorMessages[i] = err.Error()
+ }
+
+ if len(errors) != 0 {
+ return fmt.Errorf(
+ "errors occured while processing task %s (%s): %s",
+ t.Type(),
+ task.ImageId,
+ strings.Join(errorMessages, "\n"),
+ )
+ }
+
+ return nil
+ }
+}
diff --git a/backend/resize.go b/backend/resize.go
new file mode 100644
index 0000000000000000000000000000000000000000..eb3931fd87b247d11856fce36525a510bcae2a7f
--- /dev/null
+++ b/backend/resize.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+ "fmt"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
+ "github.com/justjanne/imgconv"
+ "gopkg.in/gographics/imagick.v3/imagick"
+ "path/filepath"
+ "time"
+)
+
+func ResizeImage(config *shared.Config, imageId string) []error {
+ var err error
+
+ wand := imagick.NewMagickWand()
+ defer wand.Destroy()
+
+ startRead := time.Now().UTC()
+ if err = wand.ReadImage(filepath.Join(config.SourceFolder, imageId)); err != nil {
+ return []error{err}
+ }
+ var originalImage imgconv.ImageHandle
+ if originalImage, err = imgconv.NewImage(wand); err != nil {
+ return []error{err}
+ }
+ trackTimeSince(imageProcessDurationRead, startRead)
+
+ return runMany(len(config.Sizes), func(index int) error {
+ definition := config.Sizes[index]
+ path := filepath.Join(config.TargetFolder, fmt.Sprintf("%s%s", imageId, definition.Suffix))
+ startClone := time.Now().UTC()
+ image := originalImage.CloneImage()
+ startCrop := trackTimeSince(imageProcessDurationClone, startClone)
+ if err := image.Crop(definition.Size); err != nil {
+ return err
+ }
+ startResize := trackTimeSince(imageProcessDurationCrop, startCrop)
+ if err := image.Resize(definition.Size); err != nil {
+ return err
+ }
+ startWrite := trackTimeSince(imageProcessDurationResize, startResize)
+ if err := image.Write(config.Quality, path); err != nil {
+ return err
+ }
+ trackTimeSince(imageProcessDurationWrite, startWrite)
+ return nil
+ })
+}
diff --git a/Dockerfile b/frontend/Dockerfile
similarity index 81%
rename from Dockerfile
rename to frontend/Dockerfile
index b5eaf617409a66425457862e2825b23da8c1e7cb..4bd2ffa4e1b66c21a2993c144384eb2e026b9ba1 100644
--- a/Dockerfile
+++ b/frontend/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /go/src/app
COPY go.* ./
RUN go mod download
COPY *.go ./
-RUN CGO_ENABLED=false go build -o app .
+RUN CGO_ENABLED=false go build -o app frontend
FROM node:alpine as asset_builder
RUN apk --no-cache add \
@@ -20,9 +20,9 @@ RUN apk --no-cache add \
curl \
python3
WORKDIR /app
-COPY package* /app/
+COPY frontend/package* /app/
RUN npm ci
-COPY assets /app/assets
+COPY frontend/assets /app/assets
RUN npm run build
FROM alpine:3.15
@@ -31,7 +31,7 @@ RUN apk --no-cache add imagemagick
RUN addgroup -g 1000 -S app && \
adduser -u 1000 -G app -S app
COPY --from=go_builder /go/src/app/app /
-COPY templates /templates
+COPY frontend/templates /templates
COPY --from=asset_builder /app/assets /assets
USER app
ENTRYPOINT ["/app"]
diff --git a/frontend/assets/css/fonts.css b/frontend/assets/css/fonts.css
new file mode 100644
index 0000000000000000000000000000000000000000..b2c0f8a8d213cda12525152661a7cc01b8eb1742
--- /dev/null
+++ b/frontend/assets/css/fonts.css
@@ -0,0 +1 @@
+@font-face{font-family:'Lato';src:url("/assets/fonts/Lato-Regular.eot");src:url("/assets/fonts/Lato-Regular.eot?#iefix") format("embedded-opentype"),url("/assets/fonts/Lato-Regular.woff2") format("woff2"),url("/assets/fonts/Lato-Regular.woff") format("woff"),url("/assets/fonts/Lato-Regular.ttf") format("truetype");font-style:normal;font-weight:normal;text-rendering:optimizeLegibility}@font-face{font-family:'Lato';src:url("/assets/fonts/Lato-Bold.eot");src:url("/assets/fonts/Lato-Bold.eot?#iefix") format("embedded-opentype"),url("/assets/fonts/Lato-Bold.woff2") format("woff2"),url("/assets/fonts/Lato-Bold.woff") format("woff"),url("/assets/fonts/Lato-Bold.ttf") format("truetype");font-style:normal;font-weight:bold;text-rendering:optimizeLegibility}@font-face{font-family:'Lato';src:url("/assets/fonts/Lato-BoldItalic.eot");src:url("/assets/fonts/Lato-BoldItalic.eot?#iefix") format("embedded-opentype"),url("/assets/fonts/Lato-BoldItalic.woff2") format("woff2"),url("/assets/fonts/Lato-BoldItalic.woff") format("woff"),url("/assets/fonts/Lato-BoldItalic.ttf") format("truetype");font-style:italic;font-weight:bold;text-rendering:optimizeLegibility}@font-face{font-family:'Lato';src:url("/assets/fonts/Lato-Italic.eot");src:url("/assets/fonts/Lato-Italic.eot?#iefix") format("embedded-opentype"),url("/assets/fonts/Lato-Italic.woff2") format("woff2"),url("/assets/fonts/Lato-Italic.woff") format("woff"),url("/assets/fonts/Lato-Italic.ttf") format("truetype");font-style:italic;font-weight:normal;text-rendering:optimizeLegibility}
diff --git a/frontend/assets/css/style.css b/frontend/assets/css/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..c5636cdab3259e1b2d480c168d74264aadcaed44
--- /dev/null
+++ b/frontend/assets/css/style.css
@@ -0,0 +1 @@
+*{margin:0;padding:0}*:focus{outline:none}*::-moz-focus-inner{border:0}html{height:100%}body{background:#282828;font-family:'Lato', sans-serif;font-size:81.25%;min-height:100%;display:flex;flex-direction:column}.container.centered{flex-grow:1;display:flex;margin:0 auto 64px auto;padding:0 16px;flex-direction:column;justify-content:center;width:100%;max-width:640px}.button{display:block;background:#FFC107;padding:4px 16px;border-radius:2px;box-shadow:0 1px 2px rgba(0,0,0,0.1);color:#282828;text-decoration:none;line-height:24px;cursor:pointer;min-width:40px;text-align:center}.button:hover,.button:focus{background:#FFD54F;box-shadow:0 2px 4px rgba(0,0,0,0.2)}.button[aria-disabled=true],.button:disabled{cursor:default;background:#838383;box-shadow:0 -1px 2px rgba(0,0,0,0.1)}nav.navigation{position:sticky;top:0;background:#333333;box-shadow:0 2px 4px rgba(0,0,0,0.2);padding:0 16px;z-index:100}nav.navigation ul{display:flex;max-width:1024px;margin:0 auto;height:56px;align-items:center}nav.navigation ul li{display:block}@media (max-width: 640px){nav.navigation ul li.images,nav.navigation ul li.albums{display:none}}nav.navigation ul li.title a{display:inline-block;line-height:56px}nav.navigation ul li.title a img{width:32px;height:32px;vertical-align:middle}nav.navigation ul li.spacer{flex-grow:1}nav.navigation ul li:not(.spacer){margin:0 8px}nav.navigation ul li:not(.spacer):first-child{margin-left:0}nav.navigation ul li:not(.spacer):last-child{margin-right:0}.page.upload{flex-grow:1;display:flex;flex-direction:column}.page.upload .alert{padding:16px;margin:16px 0;box-shadow:0 2px 4px rgba(33,33,33,0.2);text-decoration:none;border-radius:2px}.page.upload .alert.success{background:#DCEDC8;color:#689F38;border-color:#689F38}.page.upload .alert.success a{color:#33691E}.page.upload .alert.error{background:#FFEBEE;color:#F44336;border-color:#F44336}.page.upload .alert.error a{color:#D32F2F}.page.upload form.upload{padding:96px 0;box-shadow:0 2px 4px rgba(0,0,0,0.2);text-decoration:none;border-radius:2px;text-align:center;background:#333333}.page.upload form.upload .upload-label{font-size:18pt;color:#fff}.page.upload form.upload label{position:relative;display:inline-block;overflow:hidden}.page.upload form.upload label span.text{position:relative;display:inline-block;background:#FFC107;padding:4px 16px;border-radius:2px;box-shadow:0 1px 2px rgba(0,0,0,0.1);line-height:24px;color:#282828;cursor:pointer;z-index:1}.page.upload form.upload label span.text:hover,.page.upload form.upload label span.text:focus{background:#FFD54F;box-shadow:0 2px 4px rgba(0,0,0,0.2)}.page.upload form.upload label input[type=file]{position:absolute;left:0;right:0;top:0;bottom:0;opacity:0}.page.upload .uploading-images{display:flex;flex-direction:row}.page.upload .uploading-images .images{display:flex;flex-direction:column;align-items:stretch;flex-grow:1}.page.upload .uploading-images .images .detail{margin-bottom:32px}.page.upload .uploading-images .images .detail .image{position:relative}.page.upload .uploading-images .images .detail .image .progress{position:absolute;top:-4px;left:0;right:0;height:4px;display:block;background-color:rgba(255,193,7,0.2);overflow:hidden;transition:opacity 400ms}.page.upload .uploading-images .images .detail .image .progress .indeterminate{background-color:rgba(255,193,7,0.8)}.page.upload .uploading-images .images .detail .image .progress .indeterminate::before{content:'';position:absolute;background-color:inherit;top:0;left:0;bottom:0;will-change:left, right;animation:indeterminate 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite}.page.upload .uploading-images .images .detail .image .progress .indeterminate::after{content:'';position:absolute;background-color:inherit;top:0;left:0;bottom:0;will-change:left, right;animation:indeterminate-short 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite;animation-delay:1.125s}.page.upload .uploading-images .images .detail:not(.uploading) .progress{opacity:0}.page.upload.submitted .container.centered{display:none}.page.upload:not(.submitted) .uploading-images{display:none}@keyframes indeterminate{0%{left:-35%;right:100%}60%{left:100%;right:-90%}100%{left:100%;right:-90%}}@keyframes indeterminate-short{0%{left:-200%;right:100%}60%{left:107%;right:-8%}100%{left:107%;right:-8%}}.page.image.detail,.page.upload .uploading-images{display:flex;flex-direction:row;align-items:start;align-self:center;padding:32px 32px 128px;justify-content:center}@media (max-width: 1024px){.page.image.detail,.page.upload .uploading-images{flex-direction:column;padding:32px 0;align-items:stretch;justify-content:start}}.page.image.detail .sidebar,.page.upload .uploading-images .sidebar{width:250px;max-width:640px;margin-left:32px}.page.image.detail .sidebar .url,.page.upload .uploading-images .sidebar .url{background:#333333;border-radius:4px;box-shadow:0 2px 4px rgba(0,0,0,0.4);padding:8px;margin-bottom:8px}@media (max-width: 1024px){.page.image.detail .sidebar .url,.page.upload .uploading-images .sidebar .url{padding:16px;margin-bottom:32px}}.page.image.detail .sidebar .url p,.page.upload .uploading-images .sidebar .url p{color:#ffffff}.page.image.detail .sidebar .url div,.page.upload .uploading-images .sidebar .url div{display:flex;flex-direction:row}.page.image.detail .sidebar .url div input,.page.upload .uploading-images .sidebar .url div input{background:none;color:#fff;opacity:0.4;border:none;flex-shrink:1;display:block;flex-grow:1;width:0;text-overflow:ellipsis}.page.image.detail .sidebar .url div button.copy,.page.upload .uploading-images .sidebar .url div button.copy{display:block;background:#FFC107;padding:4px 16px;border-radius:2px;box-shadow:0 1px 2px rgba(0,0,0,0.1);border:none;font-family:'Lato', sans-serif;font-size:10pt;line-height:24px;margin-left:8px;cursor:pointer}.page.image.detail .sidebar .url div button.copy:hover,.page.image.detail .sidebar .url div button.copy:focus,.page.upload .uploading-images .sidebar .url div button.copy:hover,.page.upload .uploading-images .sidebar .url div button.copy:focus{background:#FFD54F;box-shadow:0 2px 4px rgba(0,0,0,0.2)}.page.image.detail .sidebar .actions,.page.upload .uploading-images .sidebar .actions{background:#333333;border-radius:4px;box-shadow:0 2px 4px rgba(0,0,0,0.4);display:flex;flex-direction:row;margin-bottom:8px}@media (max-width: 1024px){.page.image.detail .sidebar .actions,.page.upload .uploading-images .sidebar .actions{margin-bottom:32px}}.page.image.detail .sidebar .actions .delete-form,.page.image.detail .sidebar .actions .update-form,.page.upload .uploading-images .sidebar .actions .delete-form,.page.upload .uploading-images .sidebar .actions .update-form{display:flex;flex-grow:1;flex-basis:0}.page.image.detail .sidebar .actions .delete-form input[type=submit],.page.image.detail .sidebar .actions .update-form input[type=submit],.page.upload .uploading-images .sidebar .actions .delete-form input[type=submit],.page.upload .uploading-images .sidebar .actions .update-form input[type=submit]{display:block;background:#FFC107;padding:4px 16px;border-radius:2px;box-shadow:0 1px 2px rgba(0,0,0,0.1);border:none;font-family:'Lato', sans-serif;font-size:10pt;line-height:24px;margin:8px;flex-grow:1;cursor:pointer}@media (max-width: 1024px){.page.image.detail .sidebar .actions .delete-form input[type=submit],.page.image.detail .sidebar .actions .update-form input[type=submit],.page.upload .uploading-images .sidebar .actions .delete-form input[type=submit],.page.upload .uploading-images .sidebar .actions .update-form input[type=submit]{margin:16px}}.page.image.detail .sidebar .actions .delete-form input[type=submit]:hover,.page.image.detail .sidebar .actions .delete-form input[type=submit]:focus,.page.image.detail .sidebar .actions .update-form input[type=submit]:hover,.page.image.detail .sidebar .actions .update-form input[type=submit]:focus,.page.upload .uploading-images .sidebar .actions .delete-form input[type=submit]:hover,.page.upload .uploading-images .sidebar .actions .delete-form input[type=submit]:focus,.page.upload .uploading-images .sidebar .actions .update-form input[type=submit]:hover,.page.upload .uploading-images .sidebar .actions .update-form input[type=submit]:focus{background:#FFD54F;box-shadow:0 2px 4px rgba(0,0,0,0.2)}@media (max-width: 1024px){.page.image.detail .sidebar,.page.upload .uploading-images .sidebar{width:auto;margin-left:0;margin-top:32px}}.page.image.detail .detail,.page.upload .uploading-images .detail{max-width:640px;width:100%;background:#333333;border-radius:4px;box-shadow:0 2px 4px rgba(0,0,0,0.4)}.page.image.detail .detail .title,.page.upload .uploading-images .detail .title{line-height:1.25;padding:16px;vertical-align:middle;font-size:14pt;font-weight:normal;color:#eee;background:none;border:none;width:100%;box-sizing:border-box}.page.image.detail .detail .title:not(.fake-input):empty,.page.upload .uploading-images .detail .title:not(.fake-input):empty{display:none}.page.image.detail .detail .title:not(.fake-input):empty+.image,.page.upload .uploading-images .detail .title:not(.fake-input):empty+.image{border-top-left-radius:4px;border-top-right-radius:4px}.page.image.detail .detail .image,.page.upload .uploading-images .detail .image{background:#000;display:flex;flex-direction:row;justify-content:center;align-items:start}.page.image.detail .detail .image img,.page.upload .uploading-images .detail .image img{max-width:100%}.page.image.detail .detail .description,.page.upload .uploading-images .detail .description{line-height:1.25;padding:16px;vertical-align:middle;font-size:11pt;font-weight:normal;color:#eee;background:none;border:none;width:100%;box-sizing:border-box;font-family:'Lato', sans-serif;resize:vertical;white-space:pre-line}.page.image.detail .detail .description:not(.fake-input):empty,.page.upload .uploading-images .detail .description:not(.fake-input):empty{display:none}.page.image.detail .fake-input[contenteditable]:empty:before,.page.upload .uploading-images .fake-input[contenteditable]:empty:before{opacity:0.4;content:attr(placeholder)}.page.image.list{max-width:1024px;margin:8px auto 48px;display:grid;grid-template-columns:repeat(auto-fill, minmax(180px, 1fr));grid-gap:8px;align-self:stretch;width:calc(100% - 16px)}@media (max-width: 600px){.page.image.list{grid-template-columns:repeat(auto-fill, minmax(160px, 1fr))}}.page.image.list .image{padding:8px;position:relative;box-shadow:0 2px 4px rgba(0,0,0,0.2);transition:all 200ms;text-decoration:none;background:#333333;border-radius:2px;will-change:transform}.page.image.list .image:hover,.page.image.list .image:focus{transform:translate(0, -2px);box-shadow:0 4px 6px rgba(0,0,0,0.4)}.page.image.list .image .image-container{display:flex;justify-content:stretch;align-content:stretch;justify-items:stretch;align-items:stretch;flex-direction:column;background:#000000}.page.image.list .image .image-container img{aspect-ratio:1;object-fit:contain}.page.image.list .image .info{display:block;z-index:1;color:#eeeeee;line-height:1.25;font-size:10pt;padding-top:12px}.page.image.list .image .info p{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.page.image.list .image .info p.title{font-weight:600}.page.image.list .image .info p.title span.placeholder{opacity:0.4}ul.pagination{display:flex;flex-direction:row;background:#333;box-shadow:0 2px 4px rgba(0,0,0,0.2);padding:4px 8px;color:#fff;justify-self:center;grid-column-start:1;grid-column-end:-1;max-width:480px;width:calc(100% - 16px)}ul.pagination li.page{appearance:none;list-style:none;margin:4px;padding:0;line-height:24px}ul.pagination li.page.current{display:block;padding:4px 16px;flex-grow:1;text-align:center}
diff --git a/assets/favicon.ico b/frontend/assets/favicon.ico
similarity index 100%
rename from assets/favicon.ico
rename to frontend/assets/favicon.ico
diff --git a/assets/favicon.png b/frontend/assets/favicon.png
similarity index 100%
rename from assets/favicon.png
rename to frontend/assets/favicon.png
diff --git a/assets/favicon.svg b/frontend/assets/favicon.svg
similarity index 100%
rename from assets/favicon.svg
rename to frontend/assets/favicon.svg
diff --git a/assets/fonts/Lato-Black.eot b/frontend/assets/fonts/Lato-Black.eot
similarity index 100%
rename from assets/fonts/Lato-Black.eot
rename to frontend/assets/fonts/Lato-Black.eot
diff --git a/assets/fonts/Lato-Bold.eot b/frontend/assets/fonts/Lato-Bold.eot
similarity index 100%
rename from assets/fonts/Lato-Bold.eot
rename to frontend/assets/fonts/Lato-Bold.eot
diff --git a/assets/fonts/Lato-Bold.ttf b/frontend/assets/fonts/Lato-Bold.ttf
similarity index 100%
rename from assets/fonts/Lato-Bold.ttf
rename to frontend/assets/fonts/Lato-Bold.ttf
diff --git a/assets/fonts/Lato-Bold.woff b/frontend/assets/fonts/Lato-Bold.woff
similarity index 100%
rename from assets/fonts/Lato-Bold.woff
rename to frontend/assets/fonts/Lato-Bold.woff
diff --git a/assets/fonts/Lato-Bold.woff2 b/frontend/assets/fonts/Lato-Bold.woff2
similarity index 100%
rename from assets/fonts/Lato-Bold.woff2
rename to frontend/assets/fonts/Lato-Bold.woff2
diff --git a/assets/fonts/Lato-BoldItalic.eot b/frontend/assets/fonts/Lato-BoldItalic.eot
similarity index 100%
rename from assets/fonts/Lato-BoldItalic.eot
rename to frontend/assets/fonts/Lato-BoldItalic.eot
diff --git a/assets/fonts/Lato-BoldItalic.ttf b/frontend/assets/fonts/Lato-BoldItalic.ttf
similarity index 100%
rename from assets/fonts/Lato-BoldItalic.ttf
rename to frontend/assets/fonts/Lato-BoldItalic.ttf
diff --git a/assets/fonts/Lato-BoldItalic.woff b/frontend/assets/fonts/Lato-BoldItalic.woff
similarity index 100%
rename from assets/fonts/Lato-BoldItalic.woff
rename to frontend/assets/fonts/Lato-BoldItalic.woff
diff --git a/assets/fonts/Lato-BoldItalic.woff2 b/frontend/assets/fonts/Lato-BoldItalic.woff2
similarity index 100%
rename from assets/fonts/Lato-BoldItalic.woff2
rename to frontend/assets/fonts/Lato-BoldItalic.woff2
diff --git a/assets/fonts/Lato-Italic.eot b/frontend/assets/fonts/Lato-Italic.eot
similarity index 100%
rename from assets/fonts/Lato-Italic.eot
rename to frontend/assets/fonts/Lato-Italic.eot
diff --git a/assets/fonts/Lato-Italic.ttf b/frontend/assets/fonts/Lato-Italic.ttf
similarity index 100%
rename from assets/fonts/Lato-Italic.ttf
rename to frontend/assets/fonts/Lato-Italic.ttf
diff --git a/assets/fonts/Lato-Italic.woff b/frontend/assets/fonts/Lato-Italic.woff
similarity index 100%
rename from assets/fonts/Lato-Italic.woff
rename to frontend/assets/fonts/Lato-Italic.woff
diff --git a/assets/fonts/Lato-Italic.woff2 b/frontend/assets/fonts/Lato-Italic.woff2
similarity index 100%
rename from assets/fonts/Lato-Italic.woff2
rename to frontend/assets/fonts/Lato-Italic.woff2
diff --git a/assets/fonts/Lato-Regular.eot b/frontend/assets/fonts/Lato-Regular.eot
similarity index 100%
rename from assets/fonts/Lato-Regular.eot
rename to frontend/assets/fonts/Lato-Regular.eot
diff --git a/assets/fonts/Lato-Regular.ttf b/frontend/assets/fonts/Lato-Regular.ttf
similarity index 100%
rename from assets/fonts/Lato-Regular.ttf
rename to frontend/assets/fonts/Lato-Regular.ttf
diff --git a/assets/fonts/Lato-Regular.woff b/frontend/assets/fonts/Lato-Regular.woff
similarity index 100%
rename from assets/fonts/Lato-Regular.woff
rename to frontend/assets/fonts/Lato-Regular.woff
diff --git a/assets/fonts/Lato-Regular.woff2 b/frontend/assets/fonts/Lato-Regular.woff2
similarity index 100%
rename from assets/fonts/Lato-Regular.woff2
rename to frontend/assets/fonts/Lato-Regular.woff2
diff --git a/assets/fonts/icons.eot b/frontend/assets/fonts/icons.eot
similarity index 100%
rename from assets/fonts/icons.eot
rename to frontend/assets/fonts/icons.eot
diff --git a/assets/fonts/icons.svg b/frontend/assets/fonts/icons.svg
similarity index 100%
rename from assets/fonts/icons.svg
rename to frontend/assets/fonts/icons.svg
diff --git a/assets/fonts/icons.ttf b/frontend/assets/fonts/icons.ttf
similarity index 100%
rename from assets/fonts/icons.ttf
rename to frontend/assets/fonts/icons.ttf
diff --git a/assets/fonts/icons.woff b/frontend/assets/fonts/icons.woff
similarity index 100%
rename from assets/fonts/icons.woff
rename to frontend/assets/fonts/icons.woff
diff --git a/assets/fonts/icons.woff2 b/frontend/assets/fonts/icons.woff2
similarity index 100%
rename from assets/fonts/icons.woff2
rename to frontend/assets/fonts/icons.woff2
diff --git a/assets/images/logo.svg b/frontend/assets/images/logo.svg
similarity index 100%
rename from assets/images/logo.svg
rename to frontend/assets/images/logo.svg
diff --git a/assets/js/component/copy.js b/frontend/assets/js/component/copy.js
similarity index 100%
rename from assets/js/component/copy.js
rename to frontend/assets/js/component/copy.js
diff --git a/assets/js/component/fake-input.js b/frontend/assets/js/component/fake-input.js
similarity index 100%
rename from assets/js/component/fake-input.js
rename to frontend/assets/js/component/fake-input.js
diff --git a/assets/js/page_image_detail.js b/frontend/assets/js/page_image_detail.js
similarity index 100%
rename from assets/js/page_image_detail.js
rename to frontend/assets/js/page_image_detail.js
diff --git a/assets/js/page_upload.js b/frontend/assets/js/page_upload.js
similarity index 100%
rename from assets/js/page_upload.js
rename to frontend/assets/js/page_upload.js
diff --git a/assets/sass/_navigation.sass b/frontend/assets/sass/_navigation.sass
similarity index 100%
rename from assets/sass/_navigation.sass
rename to frontend/assets/sass/_navigation.sass
diff --git a/assets/sass/_page_image_detail.sass b/frontend/assets/sass/_page_image_detail.sass
similarity index 100%
rename from assets/sass/_page_image_detail.sass
rename to frontend/assets/sass/_page_image_detail.sass
diff --git a/assets/sass/_page_image_list.sass b/frontend/assets/sass/_page_image_list.sass
similarity index 100%
rename from assets/sass/_page_image_list.sass
rename to frontend/assets/sass/_page_image_list.sass
diff --git a/assets/sass/_page_upload.sass b/frontend/assets/sass/_page_upload.sass
similarity index 100%
rename from assets/sass/_page_upload.sass
rename to frontend/assets/sass/_page_upload.sass
diff --git a/assets/sass/_pagination.sass b/frontend/assets/sass/_pagination.sass
similarity index 100%
rename from assets/sass/_pagination.sass
rename to frontend/assets/sass/_pagination.sass
diff --git a/assets/sass/fonts.sass b/frontend/assets/sass/fonts.sass
similarity index 100%
rename from assets/sass/fonts.sass
rename to frontend/assets/sass/fonts.sass
diff --git a/assets/sass/style.sass b/frontend/assets/sass/style.sass
similarity index 100%
rename from assets/sass/style.sass
rename to frontend/assets/sass/style.sass
diff --git a/errors.go b/frontend/errors.go
similarity index 100%
rename from errors.go
rename to frontend/errors.go
diff --git a/main.go b/frontend/main.go
similarity index 73%
rename from main.go
rename to frontend/main.go
index e226fc2a3423a3e423b70bcfda57208115c4ace2..28d6751e5e34c57b0eead624c128e411dfc0b009 100644
--- a/main.go
+++ b/frontend/main.go
@@ -3,13 +3,20 @@ package main
import (
"context"
"database/sql"
- "github.com/go-redis/redis/v8"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
+ "github.com/hibiken/asynq"
_ "github.com/lib/pq"
+ "log"
"net/http"
+ "os"
)
func main() {
- config := NewConfigFromEnv()
+ configFile, err := os.Open("config.yaml")
+ if err != nil {
+ log.Fatalf("Could not open config file: %s", err.Error())
+ }
+ config := shared.LoadConfigFromFile(configFile)
db, err := sql.Open(config.Database.Format, config.Database.Url)
if err != nil {
@@ -19,10 +26,8 @@ func main() {
pageContext := PageContext{
context.Background(),
&config,
- redis.NewClient(&redis.Options{
- Addr: config.Redis.Address,
- Password: config.Redis.Password,
- }),
+ asynq.NewClient(config.AsynqOpts()),
+ config.UploadTimeoutDuration(),
db,
http.FileServer(http.Dir(config.TargetFolder)),
http.FileServer(http.Dir("assets")),
diff --git a/package-lock.json b/frontend/package-lock.json
similarity index 100%
rename from package-lock.json
rename to frontend/package-lock.json
diff --git a/package.json b/frontend/package.json
similarity index 100%
rename from package.json
rename to frontend/package.json
diff --git a/page_album_detail.go b/frontend/page_album_detail.go
similarity index 100%
rename from page_album_detail.go
rename to frontend/page_album_detail.go
index 440423fed475dbf96b2ee999519a4272ade1ec7f..94d4683964a011e47794b333d99ea78f2adbf5cf 100644
--- a/page_album_detail.go
+++ b/frontend/page_album_detail.go
@@ -1,8 +1,8 @@
package main
import (
- "net/http"
"fmt"
+ "net/http"
"path"
)
diff --git a/page_album_list.go b/frontend/page_album_list.go
similarity index 100%
rename from page_album_list.go
rename to frontend/page_album_list.go
diff --git a/page_image_detail.go b/frontend/page_image_detail.go
similarity index 100%
rename from page_image_detail.go
rename to frontend/page_image_detail.go
diff --git a/page_image_list.go b/frontend/page_image_list.go
similarity index 100%
rename from page_image_list.go
rename to frontend/page_image_list.go
diff --git a/page_index.go b/frontend/page_index.go
similarity index 100%
rename from page_index.go
rename to frontend/page_index.go
diff --git a/page_upload.go b/frontend/page_upload.go
similarity index 73%
rename from page_upload.go
rename to frontend/page_upload.go
index b5f8a0dd8db008ff51ba47fbab5b5a785d3413a9..1a4d4ff7742b0c6e767216c3cda5c57ec18ebbaf 100644
--- a/page_upload.go
+++ b/frontend/page_upload.go
@@ -5,6 +5,7 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
"io"
"mime/multipart"
"net/http"
@@ -49,7 +50,7 @@ func writeBody(reader io.ReadCloser, path string) error {
return out.Close()
}
-func createImage(config *Config, body io.ReadCloser, fileHeader *multipart.FileHeader) (Image, error) {
+func createImage(config *shared.Config, body io.ReadCloser, fileHeader *multipart.FileHeader) (Image, error) {
id := generateId()
path := filepath.Join(config.SourceFolder, id)
@@ -94,47 +95,35 @@ func pageUpload(ctx PageContext) http.Handler {
return
}
- pubsub := ctx.Redis.Subscribe(ctx.Context, ctx.Config.ResultChannel)
if _, err = ctx.Database.Exec("INSERT INTO images (id, owner, created_at, updated_at, original_name, type) VALUES ($1, $2, $3, $4, $5, $6)", image.Id, user.Id, image.CreatedAt, image.CreatedAt, image.OriginalName, image.MimeType); err != nil {
formatError(w, ErrorData{500, user, r.URL, err}, "json")
return
}
- data, err := json.Marshal(image)
+ fmt.Printf("Created task %s at %d\n", image.Id, time.Now().Unix())
+ t, err := shared.NewImageResizeTask(image.Id)
+ fmt.Printf("Submitted task %s at %d\n", image.Id, time.Now().Unix())
if err != nil {
formatError(w, ErrorData{500, user, r.URL, err}, "json")
return
}
-
- fmt.Printf("Created task %s at %d\n", image.Id, time.Now().Unix())
- ctx.Redis.RPush(ctx.Context, fmt.Sprintf("queue:%s", ctx.Config.ImageQueue), data)
- fmt.Printf("Submitted task %s at %d\n", image.Id, time.Now().Unix())
-
- waiting := true
- for waiting {
- message, err := pubsub.ReceiveMessage(ctx.Context)
- if err != nil {
- formatError(w, ErrorData{500, user, r.URL, err}, "json")
- return
- }
-
- result := Result{}
- err = json.Unmarshal([]byte(message.Payload), &result)
- if err != nil {
- formatError(w, ErrorData{500, user, r.URL, err}, "json")
- return
- }
-
- fmt.Printf("Returned task %s at %d\n", result.Id, time.Now().Unix())
-
- if result.Id == image.Id {
- waiting = false
-
- if err = returnJson(w, result); err != nil {
- formatError(w, ErrorData{500, user, r.URL, err}, "json")
- return
- }
- }
+ info, err := ctx.Async.Enqueue(t)
+ if err != nil {
+ formatError(w, ErrorData{500, user, r.URL, err}, "json")
+ return
+ }
+ if err := waitOnTask(info, ctx.UploadTimeout); err != nil {
+ formatError(w, ErrorData{500, user, r.URL, err}, "json")
+ return
+ }
+ var result Result
+ if err := json.Unmarshal(info.Result, &result); err != nil {
+ formatError(w, ErrorData{500, user, r.URL, err}, "json")
+ return
+ }
+ if err = returnJson(w, result); err != nil {
+ formatError(w, ErrorData{500, user, r.URL, err}, "json")
+ return
}
return
} else {
diff --git a/templates/_base.html b/frontend/templates/_base.html
similarity index 100%
rename from templates/_base.html
rename to frontend/templates/_base.html
diff --git a/templates/_footer.html b/frontend/templates/_footer.html
similarity index 100%
rename from templates/_footer.html
rename to frontend/templates/_footer.html
diff --git a/templates/_header.html b/frontend/templates/_header.html
similarity index 100%
rename from templates/_header.html
rename to frontend/templates/_header.html
diff --git a/templates/_navigation.html b/frontend/templates/_navigation.html
similarity index 100%
rename from templates/_navigation.html
rename to frontend/templates/_navigation.html
diff --git a/templates/error.html b/frontend/templates/error.html
similarity index 100%
rename from templates/error.html
rename to frontend/templates/error.html
diff --git a/templates/image_detail.html b/frontend/templates/image_detail.html
similarity index 100%
rename from templates/image_detail.html
rename to frontend/templates/image_detail.html
diff --git a/templates/image_list.html b/frontend/templates/image_list.html
similarity index 100%
rename from templates/image_list.html
rename to frontend/templates/image_list.html
diff --git a/templates/index.html b/frontend/templates/index.html
similarity index 100%
rename from templates/index.html
rename to frontend/templates/index.html
diff --git a/templates/upload.html b/frontend/templates/upload.html
similarity index 100%
rename from templates/upload.html
rename to frontend/templates/upload.html
diff --git a/util.go b/frontend/util.go
similarity index 58%
rename from util.go
rename to frontend/util.go
index 67f4b5c6ae6ed38b7b11e7ace73c1a49402a5a91..9290442d39e43153ce3b80fd391abfa3b2bdd4f7 100644
--- a/util.go
+++ b/frontend/util.go
@@ -5,9 +5,11 @@ import (
"database/sql"
"encoding/json"
"fmt"
- "github.com/go-redis/redis/v8"
+ "git.kuschku.de/justjanne/imghost-frontend/shared"
+ "github.com/hibiken/asynq"
"html/template"
"net/http"
+ "strings"
"time"
)
@@ -28,12 +30,13 @@ func (info UserInfo) HasRole(role string) bool {
}
type PageContext struct {
- Context context.Context
- Config *Config
- Redis *redis.Client
- Database *sql.DB
- Images http.Handler
- AssetServer http.Handler
+ Context context.Context
+ Config *shared.Config
+ Async *asynq.Client
+ UploadTimeout time.Duration
+ Database *sql.DB
+ Images http.Handler
+ AssetServer http.Handler
}
type AlbumImage struct {
@@ -52,19 +55,11 @@ type Album struct {
}
func parseUser(r *http.Request) UserInfo {
- /*
- return UserInfo{
- r.Header.Get("X-Auth-Subject"),
- r.Header.Get("X-Auth-Username"),
- r.Header.Get("X-Auth-Email"),
- strings.Split(r.Header.Get("X-Auth-Roles"), ","),
- }
- */
return UserInfo{
- "ad45284c-be4d-4546-8171-41cf126ac091",
- "justJanne",
- "janne@kuschku.de",
- []string{"imghost:user", "imghost:admin"},
+ r.Header.Get("X-Auth-Subject"),
+ r.Header.Get("X-Auth-Username"),
+ r.Header.Get("X-Auth-Email"),
+ strings.Split(r.Header.Get("X-Auth-Roles"), ","),
}
}
@@ -110,3 +105,28 @@ func formatTemplate(w http.ResponseWriter, templateName string, data interface{}
return nil
}
+
+func waitOnTask(info *asynq.TaskInfo, timeout time.Duration) error {
+ total := time.Duration(0)
+ for total < timeout && info.State != asynq.TaskStateCompleted {
+ for info.State == asynq.TaskStateScheduled {
+ duration := info.NextProcessAt.Sub(time.Now())
+ total += duration
+ if total < timeout {
+ time.Sleep(duration)
+ }
+ }
+ if info.State != asynq.TaskStateCompleted {
+ duration := time.Duration(1 * time.Second)
+ total += duration
+ if total < timeout {
+ time.Sleep(duration)
+ }
+ }
+ }
+ if info.State == asynq.TaskStateCompleted {
+ return nil
+ } else {
+ return fmt.Errorf("timed out waiting on task: %s (%s)", info.Type, info.ID)
+ }
+}
diff --git a/go.mod b/go.mod
index 68c6b331fdf9446a0fcce42ab42809ebf35f41b5..b237f8afcd382886f1581083f6897b5b3f863a8f 100644
--- a/go.mod
+++ b/go.mod
@@ -4,5 +4,14 @@ go 1.15
require (
github.com/go-redis/redis/v8 v8.11.5
+ github.com/google/uuid v1.3.0 // indirect
+ github.com/hibiken/asynq v0.23.0 // indirect
+ github.com/justjanne/imgconv v1.4.1
github.com/lib/pq v1.10.4
+ github.com/prometheus/client_golang v1.11.1
+ github.com/spf13/cast v1.5.0 // indirect
+ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+ golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
+ google.golang.org/protobuf v1.28.0 // indirect
+ gopkg.in/gographics/imagick.v3 v3.4.0
)
diff --git a/go.sum b/go.sum
index 765c44e807e3fed3787cdcba1330c46d5880ea2b..4da4b2fc8b81940db4c9b8a9a355f722b5bad8f5 100644
--- a/go.sum
+++ b/go.sum
@@ -1,114 +1,262 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
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-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-redis/redis/v8 v8.11.2/go.mod h1:DLomh7y2e3ggQXQLd1YgmvIfecPJoFl7WU5SOQ/r06M=
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/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.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
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.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hibiken/asynq v0.23.0 h1:kmKkNFgqiXBatC8oz94Mer6uvKoGn4STlIVDV5wnKyE=
+github.com/hibiken/asynq v0.23.0/go.mod h1:K70jPVx+CAmmQrXot7Dru0D52EO7ob4BIun3ri5z1Qw=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/justjanne/imgconv v1.4.1/go.mod h1:6uRn+br2dIv8K5G9iEVjAmBan0/GAW2++OEAVDuk0GE=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
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/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/ginkgo/v2 v2.0.0 h1:CcuG/HvWNkkaqCUpJifQY8z7qEMBJya6aLPx6ftGyjQ=
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
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/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
-github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
+github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/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/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
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-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
+golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
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-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220411224347-583f2d630306 h1:+gHMid33q6pen7kv9xvT+JRinntgeXO2AeZVd0AWD3w=
+golang.org/x/time v0.0.0-20220411224347-583f2d630306/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
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/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
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.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
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/gographics/imagick.v3 v3.4.0/go.mod h1:+Q9nyA2xRZXrDyTtJ/eko+8V/5E7bWYs08ndkZp8UmA=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
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.2.5/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=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/shared/config.go b/shared/config.go
new file mode 100644
index 0000000000000000000000000000000000000000..4e380c265f77edb50672986ca28434955534540b
--- /dev/null
+++ b/shared/config.go
@@ -0,0 +1,59 @@
+package shared
+
+import (
+ "github.com/hibiken/asynq"
+ "github.com/justjanne/imgconv"
+ "gopkg.in/yaml.v2"
+ "log"
+ "os"
+ "time"
+)
+
+type SizeDefinition struct {
+ Size imgconv.Size `yaml:"size"`
+ Suffix string `yaml:"suffix"`
+}
+
+type RedisConfig struct {
+ Address string `yaml:"address"`
+ Password string `yaml:"password"`
+}
+
+type DatabaseConfig struct {
+ Format string `yaml:"format"`
+ Url string `yaml:"url"`
+}
+
+type Config struct {
+ Sizes []SizeDefinition `yaml:"sizes"`
+ Quality imgconv.Quality `yaml:"quality"`
+ SourceFolder string `yaml:"source-folder"`
+ TargetFolder string `yaml:"target-folder"`
+ Redis RedisConfig `yaml:"redis"`
+ Database DatabaseConfig `yaml:"database"`
+ Concurrency int `yaml:"concurrency"`
+ UploadTimeout string `yaml:"upload-timeout"`
+}
+
+func LoadConfigFromFile(file *os.File) Config {
+ var config Config
+ if err := yaml.NewDecoder(file).Decode(&config); err != nil {
+ log.Fatalf("Could not load config, %s", err.Error())
+ }
+ return config
+}
+
+func (config Config) UploadTimeoutDuration() time.Duration {
+ duration, err := time.ParseDuration(config.UploadTimeout)
+ if err != nil {
+ log.Fatalf("Could not load config: Could not parse upload timeout, %s", err.Error())
+ }
+ return duration
+}
+
+func (config Config) AsynqOpts() asynq.RedisClientOpt {
+ return asynq.RedisClientOpt{
+ Addr: config.Redis.Address,
+ Password: config.Redis.Password,
+ }
+}
diff --git a/shared/task.go b/shared/task.go
new file mode 100644
index 0000000000000000000000000000000000000000..a4cf99efc13aaa455187b7b6ad8cd0497824d2c8
--- /dev/null
+++ b/shared/task.go
@@ -0,0 +1,22 @@
+package shared
+
+import (
+ "encoding/json"
+ "github.com/hibiken/asynq"
+)
+
+const (
+ TypeImageResize = "image:resize"
+)
+
+type ImageTaskPayload struct {
+ ImageId string
+}
+
+func NewImageResizeTask(imageId string) (*asynq.Task, error) {
+ payload, err := json.Marshal(ImageTaskPayload{ImageId: imageId})
+ if err != nil {
+ return nil, err
+ }
+ return asynq.NewTask(TypeImageResize, payload), nil
+}
diff --git a/shared/types.go b/shared/types.go
new file mode 100644
index 0000000000000000000000000000000000000000..84331174836e3917d45b37d0e6172064f8b4653b
--- /dev/null
+++ b/shared/types.go
@@ -0,0 +1,20 @@
+package shared
+
+import (
+ "time"
+)
+
+type Image struct {
+ Id string `json:"id"`
+ Title string
+ Description string
+ CreatedAt time.Time
+ OriginalName string
+ MimeType string `json:"mime_type"`
+}
+
+type Result struct {
+ Id string `json:"id"`
+ Success bool `json:"success"`
+ Errors []string `json:"errors"`
+}
diff --git a/types.go b/types.go
deleted file mode 100644
index 2ea713f939eb5193892cb27f757bfac973f9a7ea..0000000000000000000000000000000000000000
--- a/types.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package main
-
-import (
- "encoding/json"
- "os"
- "time"
-)
-
-type Image struct {
- Id string `json:"id"`
- Title string
- Description string
- CreatedAt time.Time
- OriginalName string
- MimeType string `json:"mime_type"`
-}
-
-type Result struct {
- Id string `json:"id"`
- Success bool `json:"success"`
- Errors []string `json:"errors"`
-}
-
-type Size struct {
- Width uint `json:"width"`
- Height uint `json:"height"`
- Format string `json:"format"`
-}
-
-const (
- sizeFormatCover = "cover"
- sizeFormatContain = "contain"
-)
-
-type Quality struct {
- CompressionQuality uint `json:"compression_quality"`
- SamplingFactors []float64 `json:"sampling_factors"`
-}
-
-type SizeDefinition struct {
- Size Size `json:"size"`
- Suffix string `json:"suffix"`
-}
-
-type RedisConfig struct {
- Address string
- Password string
-}
-
-type DatabaseConfig struct {
- Format string
- Url string
-}
-
-type Config struct {
- Sizes []SizeDefinition
- Quality Quality
- SourceFolder string
- TargetFolder string
- Redis RedisConfig
- Database DatabaseConfig
- ImageQueue string
- ResultChannel string
-}
-
-func NewConfigFromEnv() Config {
- config := Config{}
-
- json.Unmarshal([]byte(os.Getenv("IK8R_SIZES")), &config.Sizes)
- json.Unmarshal([]byte(os.Getenv("IK8R_QUALITY")), &config.Quality)
- config.SourceFolder = os.Getenv("IK8R_SOURCE_FOLDER")
- config.TargetFolder = os.Getenv("IK8R_TARGET_FOLDER")
- config.Redis.Address = os.Getenv("IK8R_REDIS_ADDRESS")
- config.Redis.Password = os.Getenv("IK8R_REDIS_PASSWORD")
- config.ImageQueue = os.Getenv("IK8R_REDIS_IMAGE_QUEUE")
- config.ResultChannel = os.Getenv("IK8R_REDIS_RESULT_CHANNEL")
- config.Database.Format = os.Getenv("IK8R_DATABASE_TYPE")
- config.Database.Url = os.Getenv("IK8R_DATABASE_URL")
-
- return config
-}