Merge remote-tracking branch 'origin/master'

Author: hugopl

.ameba.yml

@@ -31,6 +31,8 @@ Style/VerboseBlock:
   Enabled: true
   Severity: Convention
 
+Documentation/DocumentationAdmonition:
+  Enabled: false
 # Problems found: 1
 # Run `ameba --only Lint/LiteralInCondition` for details
 Lint/LiteralInCondition:
@@ -55,3 +57,11 @@ Lint/UselessAssign:
   - src/sidekiq/web.cr
   Enabled: true
   Severity: Warning
+Naming/AccessorMethodName:
+  Excluded:
+  - src/sidekiq/web_helpers.cr
+Naming/BlockParameterName:
+  Enabled: false
+Naming/AsciiIdentifiers:
+  Excluded:
+  - src/sidekiq/server/heartbeat.cr

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@master
 
       - name: Crystal Ameba Linter
-        uses: crystal-ameba/github-action@v0.7.1
+        uses: crystal-ameba/github-action@v0.9.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

src/sidekiq/server/exception_handler.cr

@@ -19,8 +19,8 @@ module Sidekiq
       ctx.error_handlers.each do |handler|
         begin
           handler.call(ex, ctx_hash)
-        rescue ex2
-          ctx.logger.error(exception: ex2) { "!!! ERROR HANDLER THREW AN ERROR !!!" }
+        rescue e
+          ctx.logger.error(exception: e) { "!!! ERROR HANDLER THREW AN ERROR !!!" }
         end
       end
     end