resque-scheduler 4.9.0 → 4.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be1ad7d71c519660fafb8b0ccdae4b2b508e9577a1af5dbb8a57f8c7bce1a02f
-  data.tar.gz: 742e298554473ed422e15c420a981f38c446c333636d6cdd09cd511eebda4584
+  metadata.gz: cf0c6b96fa880ba5a817d63c04d9e17a070061c1f3cd7fe8b9ad6c91c2ffe016
+  data.tar.gz: a01edeea347f025e87b7327a89a6fb509716ecea47b3cbe1a8c4eea0de08e3ff
 SHA512:
-  metadata.gz: 91874b66e46123e8ef0476518b98ee6a1923fba44d4feff923bdf1be0b2319da8a60141dbaf91c99e0a62817c8904c223c67f38a6b153b54fc63b8717aa5235d
-  data.tar.gz: 55d87dfb5ec01b799f5062354bfa0d80b1194833b7a52eed0e4807f55f2bd50df7e231166ea73847c6195423b12ca76b4732b94409a755bdccf280e3ce2b739b
+  metadata.gz: 4a8facf77afaf21a8a39ebfab4cac5f42d97e743a353f70e43dfc3caa7f97da8ff6c9f868d57e9d7ba36c96f4b91cf4c66032e0803d69a1f2f04283e0fddac65
+  data.tar.gz: 470bbd7ded28c0c4b62d3aa4bfa9b78c04066e3e430a124c6671c6dd336b3678ff3edab5266a72a705bb6cc8b65e1899b70891b4b06829dc417396d3aebaf8b1

data/.github/workflows/codeql-analysis.yml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

data/.github/workflows/rubocop.yml

@@ -14,11 +14,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby: [
-            2.4
+            2.7
         ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.github/workflows/ruby.yml

@@ -72,7 +72,7 @@ jobs:
       COVERAGE: 1
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: "${{ matrix.ruby-version }}"

data/AUTHORS.md

@@ -89,3 +89,4 @@ Resque Scheduler authors
 - sawanoboly
 - serek
 - iloveitaly
+- treacher

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 **ATTN**: This project uses [semantic versioning](http://semver.org/).
 
+## [4.10.1] - 2023-12-15
+### Fixed
+* Fix json dump crasher with JSON 2.7.0+ by @PatrickTulskie in #781
+* Fix for #761, reflected XSS in delayed_schedules.erb by @PatrickTulskie in #780
+
+## [4.10.0] - 2023-08-20
+### Added
+* Add logfmt option for logging output (#763)
+
+### Fixed
+* Rubocop Fixes (#771)
+
 ## [4.9.0] - 2023-05-31
 ### Changed
 - Adding batching to re-queuing for timestamp by @brennen-stripe in #767

data/README.md

@@ -139,7 +139,7 @@ requiring `resque` and `resque/scheduler` (default empty).
 * `RESQUE_SCHEDULER_INTERVAL` - Interval in seconds for checking if a
 scheduled job must run (coerced with `Kernel#Float()`) (default `5`)
 * `LOGFILE` - Log file name (default empty, meaning `$stdout`)
-* `LOGFORMAT` - Log output format to use (either `'text'` or `'json'`,
+* `LOGFORMAT` - Log output format to use (either `'text'`, `'json'` or `'logfmt'`,
 default `'text'`)
 * `PIDFILE` - If non-empty, write process PID to file (default empty)
 * `QUIET` - Silence most output if non-empty (equivalent to a level of
@@ -663,7 +663,7 @@ are toggled by environment variables:
   - `QUIET` will stop logging anything. Completely silent.
   - `VERBOSE` opposite of 'QUIET'; will log even debug information
   - `LOGFILE` specifies the file to write logs to. (default standard output)
-  - `LOGFORMAT` specifies either "text" or "json" output format
+  - `LOGFORMAT` specifies either "text", "json" or "logfmt" output format
     (default "text")
 
 All of these variables are optional and will be given the following default

data/lib/resque/scheduler/configuration.rb

@@ -44,7 +44,7 @@ module Resque
         @logfile ||= environment['LOGFILE']
       end
 
-      # Sets whether to log in 'text' or 'json'
+      # Sets whether to log in 'text', 'json' or 'logfmt'
       attr_writer :logformat
 
       def logformat

data/lib/resque/scheduler/logger_builder.rb

@@ -15,7 +15,7 @@ module Resque
       #   - :quiet if logger needs to be silent for all levels. Default - false
       #   - :verbose if there is a need in debug messages. Default - false
       #   - :log_dev to output logs into a desired file. Default - STDOUT
-      #   - :format log format, either 'text' or 'json'. Default - 'text'
+      #   - :format log format, either 'text', 'json' or 'logfmt'. Default - 'text'
       #
       # Example:
       #
@@ -32,6 +32,7 @@ module Resque
       # Returns an instance of MonoLogger
       def build
         logger = MonoLogger.new(@log_dev)
+        logger.progname = 'resque-scheduler'.freeze
         logger.level = level
         logger.formatter = send(:"#{@format}_formatter")
         logger
@@ -50,21 +51,31 @@ module Resque
       end
 
       def text_formatter
-        proc do |severity, datetime, _progname, msg|
-          "resque-scheduler: [#{severity}] #{datetime.iso8601}: #{msg}\n"
+        proc do |severity, datetime, progname, msg|
+          "#{progname}: [#{severity}] #{datetime.iso8601}: #{msg}\n"
         end
       end
 
       def json_formatter
         proc do |severity, datetime, progname, msg|
           require 'json'
-          JSON.dump(
-            name: 'resque-scheduler',
+          log_data = {
+            name: progname,
             progname: progname,
             level: severity,
             timestamp: datetime.iso8601,
             msg: msg
-          ) + "\n"
+          }
+          JSON.dump(log_data) + "\n"
+        end
+      end
+
+      def logfmt_formatter
+        proc do |severity, datetime, progname, msg|
+          "timestamp=\"#{datetime.iso8601}\" " \
+          "level=\"#{severity}\" " \
+          "progname=\"#{progname}\" " \
+          "msg=\"#{msg}\"\n"
         end
       end
     end

data/lib/resque/scheduler/server/views/delayed_schedules.erb

@@ -1,4 +1,4 @@
-<h1>Delayed jobs scheduled for <%= params[:klass] %> (<%= show_job_arguments(@args) %>)</h1>
+<h1>Delayed jobs scheduled for <%=h params[:klass] %> (<%= show_job_arguments(@args) %>)</h1>
 
 <table class='jobs'>
 <tr>

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '4.9.0'.freeze
+    VERSION = '4.10.1'.freeze
   end
 end

data/resque-scheduler.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
     Ryan Biesemeyer
     Dan Buch
     Michael Bianco
+    Patrick Tulskie
   EOF
   spec.email = %w(
     bvandenbos@gmail.com
@@ -19,6 +20,7 @@ Gem::Specification.new do |spec|
     ryan@yaauie.com
     dan@meatballhat.com
     mike@mikebian.co
+    patricktulskie@gmail.com
   )
   spec.summary = 'Light weight job scheduling on top of Resque'
   spec.description = <<-DESCRIPTION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.1
 platform: ruby
 authors:
 - Ben VandenBos
@@ -9,10 +9,11 @@ authors:
 - Ryan Biesemeyer
 - Dan Buch
 - Michael Bianco
+- Patrick Tulskie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -254,6 +255,7 @@ email:
 - ryan@yaauie.com
 - dan@meatballhat.com
 - mike@mikebian.co
+- patricktulskie@gmail.com
 executables:
 - resque-scheduler
 extensions: []