gitlab-mail_room 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219f2185b18471c72198ed5c0a55a1428139f7b944f90d1f2428bbc9961e95e9
-  data.tar.gz: f3fadcc3962ac8325c3c461cda65a81e6c7df40a1b575a303a9073b1773252e9
+  metadata.gz: 3aef2538505e8ae118f1a7ad8fe25d1ced7dff264f74427b0e8a4ebe4b07bec1
+  data.tar.gz: f765a548cbb934e04a482852501b6c6d66055528649db07828a01315667f8f32
 SHA512:
-  metadata.gz: e279af4924d7a87fabedbae769785ed2c5f258091651c2f3089225a0bacb1a2ab54b23931a925304e6b0f9cfaeb88f4d93d97763c663774b27bc0def8fbf1bac
-  data.tar.gz: 470d47c934a55ccd789c19da2188e889c6d953e5ebb5ff0be9d70be98db3ab770a3646646faf9596f1296660974d29b1ef02ba7c13fe1b6a1cfb36bc363330d6
+  metadata.gz: 041ee7bec2b17ce6af2de5db39a36403b8c51ea9ba58e0b4bfeb0cf5ca6298cae8ee8e902e8391c0f9200e3dfbf03bbf5831a4e938862ddf813b1229996c6f00
+  data.tar.gz: 0f67f7e7f883b743f279f1af998f8172d47807592394318b7b1bcac7421ebc9d8400c3bd9c58648208a6dd3253cb3e652faf4b84c53e90e993360e1595bf05f5

data/README.md

@@ -2,7 +2,21 @@
 
 ## Fork notice
 
-mail_room contains some merged functionality that GitLab requires, so this mirror fork is to help us release custom functionality.
+`mail_room` contains some merged functionality that GitLab requires, so this mirror fork is to help us release custom functionality.
+
+It needs to be more or less kept up to date with the original, so please feel free to incorporate changes to the upstream repo if you see them.
+
+### Rationale
+
+This fork is required to reduce dependency on the upstream releases.
+
+The [original JSON structured logging PR](https://github.com/tpitale/mail_room/pull/88) was [released](https://github.com/tpitale/mail_room/commit/deb8fe63bab21c5c3003346961a815d137ff6d2d) and we [bumped the version](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3719) to incorporate it into [omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab).
+It turned out that when Mailroom crashed out (which it's designed to do), the crash log [wasn't being pulled into elastic in a very useful way](https://github.com/tpitale/mail_room/commits/master) (that is, every line of the stack trace was a new event) so [another PR](https://github.com/tpitale/mail_room/pull/103) was raised.
+
+Rather than wait for the author (or bugging him more than once), we [opted for bias for action](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19186#note_290758986) and made a fork of the gem.
+Here it is [in omnibus](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/3960).
+
+The fork is useful as we can post quick fixes to our own fork and release fixes quickly, and still contribute those fixes upstream to help others.
 
 ## README
 

data/lib/mail_room/crash_handler.rb

@@ -17,6 +17,7 @@ module MailRoom
         return
       end
 
+      # 'plain' is equivalent to outputting the error into stdout as-is
       raise error
     end
 

data/lib/mail_room/mailbox.rb

@@ -106,7 +106,7 @@ module MailRoom
       body = message.attr['RFC822']
       return true unless body
 
-      logger.info({context: context, uid: message.attr['UID'], action: "sending to deliverer", deliverer: delivery.class.name, byte_size: message.attr['RFC822.SIZE']})
+      logger.info({context: context, uid: message.attr['UID'], action: "sending to deliverer", deliverer: delivery.class.name, byte_size: body.bytesize})
       delivery.deliver(body)
     end
 

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of MailRoom gem
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake