From 585e5d0199e21c9eeb97b6dc144ba635e72e2081 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 1 Jun 2021 15:14:02 +0200
Subject: [PATCH 1/5] :paperclip: Minor changes on internal audit module
 buffers.

---
 backend/src/app/loggers/audit.clj | 4 ++--
 backend/src/app/util/async.clj    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj
index bbffcf781..3aca18ed9 100644
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -75,9 +75,9 @@
   [_ {:keys [enabled] :as cfg}]
   (when enabled
     (l/info :msg "intializing audit collector")
-    (let [input  (a/chan 1 event-xform)
+    (let [input  (a/chan 512 event-xform)
           buffer (aa/batch input {:max-batch-size 100
-                                  :max-batch-age (* 5 1000)
+                                  :max-batch-age (* 10 1000) ; 10s
                                   :init []})]
       (a/go-loop []
         (when-let [[type events] (a/<! buffer)]
diff --git a/backend/src/app/util/async.clj b/backend/src/app/util/async.clj
index 984cbb167..6193fbe2f 100644
--- a/backend/src/app/util/async.clj
+++ b/backend/src/app/util/async.clj
@@ -64,12 +64,14 @@
 (defn batch
   [in {:keys [max-batch-size
               max-batch-age
+              buffer-size
               init]
        :or {max-batch-size 200
             max-batch-age (* 30 1000)
+            buffer-size 128
             init #{}}
        :as opts}]
-  (let [out (a/chan)]
+  (let [out (a/chan buffer-size)]
     (a/go-loop [tch (a/timeout max-batch-age) buf init]
       (let [[val port] (a/alts! [tch in])]
         (cond

From 2d6a375afcc75ed3f56bd33405bad2e958ff771e Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 1 Jun 2021 15:18:26 +0200
Subject: [PATCH 2/5] :paperclip: Update changelog.

---
 CHANGES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index cdfd2d3ff..c969a5585 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,10 @@
 ### :bug: Bugs fixed
 
 - Fix problem with merge and join nodes [#990](https://github.com/penpot/penpot/issues/990)
+- Fix problem with empty path editing.
+- Fix problem with create component.
+- Fix problem with move-objects.
+- Fix problem with merge and join nodes.
 
 ## 1.6.2-alpha
 

From a6de4e3742a79e59f2d17981014c30b4e864a2bf Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 1 Jun 2021 15:19:37 +0200
Subject: [PATCH 3/5] :paperclip: Change version.txt file.

---
 version.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version.txt b/version.txt
index 185e49d66..231f4811d 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.6.2-alpha
+1.6.3-alpha

From 9f034c7e7e852fb04011d741a67d9dae2bf7022d Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 2 Jun 2021 11:27:22 +0200
Subject: [PATCH 4/5] :sparkles: Disable excesive logging of some modules.

---
 backend/src/app/http/session.clj  | 5 ++++-
 backend/src/app/loggers/audit.clj | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj
index d1b0170bb..acff16136 100644
--- a/backend/src/app/http/session.clj
+++ b/backend/src/app/http/session.clj
@@ -140,10 +140,13 @@
       (when-let [[reason batch] (a/<! input)]
         (let [result (a/<! (update-sessions cfg batch))]
           (mcnt :inc)
-          (if (ex/exception? result)
+          (cond
+            (ex/exception? result)
             (l/error :task "updater"
                      :hint "unexpected error on update sessions"
                      :cause result)
+
+            (= :size reason)
             (l/debug :task "updater"
                      :action "update sessions"
                      :reason (name reason)
diff --git a/backend/src/app/loggers/audit.clj b/backend/src/app/loggers/audit.clj
index 3aca18ed9..0a37e86a2 100644
--- a/backend/src/app/loggers/audit.clj
+++ b/backend/src/app/loggers/audit.clj
@@ -81,9 +81,6 @@
                                   :init []})]
       (a/go-loop []
         (when-let [[type events] (a/<! buffer)]
-          (l/debug :action "persist-events (batch)"
-                   :reason (name type)
-                   :count (count events))
           (let [res (a/<! (persist-events cfg events))]
             (when (ex/exception? res)
               (l/error :hint "error on persiting events"

From 056fce91870e70cc6f8efb527aa0cd75b1d52638 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 2 Jun 2021 13:13:25 +0200
Subject: [PATCH 5/5] :paperclip: Minor changes on background tasks cron expr.

---
 backend/src/app/main.clj | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj
index a3cfb79f5..0cca40056 100644
--- a/backend/src/app/main.clj
+++ b/backend/src/app/main.clj
@@ -166,25 +166,25 @@
     :tasks      (ig/ref :app.worker/registry)
     :pool       (ig/ref :app.db/pool)
     :schedule
-    [{:cron #app/cron "0 0 0 */1 * ? *" ;; daily
+    [{:cron #app/cron "0 0 0 * * ? *" ;; daily
       :task :file-media-gc}
 
-     {:cron #app/cron "0 0 */1 * * ?"  ;; hourly
+     {:cron #app/cron "0 0 * * * ?"  ;; hourly
       :task :file-xlog-gc}
 
-     {:cron #app/cron "0 0 1 */1 * ?"  ;; daily (1 hour shift)
+     {:cron #app/cron "0 0 1 * * ?"  ;; daily (1 hour shift)
       :task :storage-deleted-gc}
 
-     {:cron #app/cron "0 0 2 */1 * ?"  ;; daily (2 hour shift)
+     {:cron #app/cron "0 0 2 * * ?"  ;; daily (2 hour shift)
       :task :storage-touched-gc}
 
-     {:cron #app/cron "0 0 3 */1 * ?"  ;; daily (3 hour shift)
+     {:cron #app/cron "0 0 3 * * ?"  ;; daily (3 hour shift)
       :task :session-gc}
 
-     {:cron #app/cron "0 0 */1 * * ?"  ;; hourly
+     {:cron #app/cron "0 0 * * * ?"  ;; hourly
       :task :storage-recheck}
 
-     {:cron #app/cron "0 0 0 */1 * ?"  ;; daily
+     {:cron #app/cron "0 0 0 * * ?"  ;; daily
       :task :tasks-gc}
 
      (when (cf/get :audit-archive-enabled)