lumberjack_syslog_device 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54c251e482e25bc736ad9947d10faee5afe7ea0df526df3ba7aaf80cb2487258
-  data.tar.gz: 1a190f22ebeb58d6b93388184b01270c8348f00444e3d94b122239c89791c9da
+  metadata.gz: ae9edfa3889248b54ab6ab7daca3d417a6879a1a16bd15cda77b9f913f19d418
+  data.tar.gz: c416513472887a7b4a34ff6194d84db8620a485298f0cd03e542d2270a26448c
 SHA512:
-  metadata.gz: 0d0091c9a2887b37f471fe65ce665fca5047d399c116ccf29305d401b1888c9094cd0c09bc98f4682043241aed7df2da0b1434b3d8e7959453bcb503b4a23ef0
-  data.tar.gz: 8dcb7a000c0c391fe1d92a07e7e0bf021fdd3120ddccdde277f5a33ff902bdb86f38a895b6437001ce61d039a9a42a8a7cbc772a86c53e58d7a7600a9b400a6f
+  metadata.gz: 6c6d7ad6cb82f45738370573a8d215a658296848b54f87e663819b20178ab6363872fc4aaac6edd9786238bfe1930721351969d89e9ce09e9f7b233585518242
+  data.tar.gz: d31ba78fa6219ebeffd579c6edeb54d119e3d24c6df85c0a86930d9e9652d966ebea4c6566ab8878df1d0cb2b9567fec03e7f79ca6c1d57dc2a2cb62185d4554

data/.github/dependabot.yml

@@ -1,4 +1,3 @@
-# Dependabot update strategy
 version: 2
 updates:
   - package-ecosystem: bundler
@@ -6,7 +5,10 @@ updates:
     schedule:
       interval: weekly
     allow:
-      # Automatically keep all runtime dependencies updated
       - dependency-name: "*"
         dependency-type: "production"
-    versioning-strategy: lockfile-only
+    versioning-strategy: increase-if-necessary
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly

data/.github/workflows/continuous_integration.yml

@@ -10,12 +10,6 @@ on:
       - actions-*
   workflow_dispatch:
 
-env:
-  BUNDLE_CLEAN: "true"
-  BUNDLE_PATH: vendor/bundle
-  BUNDLE_JOBS: 3
-  BUNDLE_RETRY: 3
-
 jobs:
   build:
     name: ${{ matrix.ruby }} build
@@ -29,19 +23,16 @@ jobs:
           - ruby: "3.0"
           - ruby: "2.7"
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby}}
-    - name: Install gems
-      run: |
-        bundle install
-    - name: Run Tests
-      run: bundle exec rake
-    - name: standardrb
-      if: matrix.standardrb
-      run:  bundle exec standardrb
-    - name: yard
-      if: matrix.yard == true
-      run:  bundle exec yard --fail-on-warning
+      - name: Checkout
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
+      - name: Ruby CI
+        uses: bdurand/github-actions/ruby-ci@b7560883d5f8557f5d69fe8bd82721bbb5ed76df # v1.0.4
+        with:
+          ruby: ${{ matrix.ruby }}
+          appraisal: ${{ matrix.appraisal }}
+          bundler: ${{ matrix.bundler }}
+          standardrb: ${{ matrix.standardrb }}
+          yard: ${{ matrix.yard }}
+          frozen_strings: ${{ matrix.frozen_strings }}

data/.standard.yml

@@ -1,10 +1,3 @@
-# I really just have issues with the automatic "semantic blocks"
-
 ruby_version: 2.7
 
 format: progress
-
-ignore:
-  - 'spec/**/*':
-    - Lint/UselessAssignment
-    - Lint/Void

data/{CHANGE_LOG.md → CHANGELOG.md}

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.0.1
+
+### Fixed
+
+- Fixed `close` raising a `NoMethodError` due to referencing an unset lock and connection.
+- Fixed the syslog connection being closed and reopened on every write when using the default facility. The facility now defaults to `Syslog::LOG_USER` so the connection reuse check matches what syslog reports.
+- A nil progname now opens syslog with a nil ident so syslog defaults to the program name instead of an empty string.
+- Unmapped severity values are now logged as `Syslog::LOG_ALERT` instead of raising a `TypeError`.
+- The log mask is now reset when reusing a connection opened elsewhere with a more restrictive mask.
+
 ## 2.0.0
 
 ### Added

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/lumberjack/syslog_device.rb

@@ -79,9 +79,10 @@ module Lumberjack
       @template = Template.new(@template, attribute_format: attribute_format) if @template.is_a?(String)
 
       @syslog_options = options[:options] || (Syslog::LOG_PID | Syslog::LOG_CONS)
-      @syslog_facility = options[:facility]
+      # Syslog substitutes LOG_USER for a nil facility; normalize here so the
+      # connection reuse check in open_syslog matches what syslog reports back.
+      @syslog_facility = options[:facility] || Syslog::LOG_USER
       @close_connection = options[:close_connection]
-      @syslog_identity = nil
     end
 
     # Write a log entry to syslog.
@@ -90,10 +91,11 @@ module Lumberjack
     # @return [void]
     def write(entry)
       message = @template.call(entry).to_s.chomp.gsub(PERCENT, ESCAPED_PERCENT)
+      severity = SEVERITY_MAP[entry.severity] || Syslog::LOG_ALERT
       @@lock.synchronize do
         syslog = open_syslog(entry.progname)
         begin
-          syslog.log(SEVERITY_MAP[entry.severity], message)
+          syslog.log(severity, message)
         ensure
           syslog.close if @close_connection
         end
@@ -105,8 +107,8 @@ module Lumberjack
     # @return [void]
     def close
       flush
-      @lock.synchronize do
-        @syslog.close if @syslog&.opened?
+      @@lock.synchronize do
+        syslog_implementation.close if syslog_implementation.opened?
       end
     end
 
@@ -118,12 +120,15 @@ module Lumberjack
       syslog_impl = syslog_implementation
       if syslog_impl.opened?
         if (progname.nil? || syslog_impl.ident == progname.to_s) && @syslog_facility == syslog_impl.facility && @syslog_options == syslog_impl.options
+          syslog_impl.mask = Syslog::LOG_UPTO(Syslog::LOG_DEBUG)
           return syslog_impl
         else
           syslog_impl.close
         end
       end
-      syslog = syslog_impl.open(progname.to_s, @syslog_options, @syslog_facility)
+      # Pass nil rather than an empty string when there is no progname so that
+      # syslog falls back to the program name for the ident.
+      syslog = syslog_impl.open(progname&.to_s, @syslog_options, @syslog_facility)
       syslog.mask = Syslog::LOG_UPTO(Syslog::LOG_DEBUG)
       syslog
     end

data/lumberjack_syslog_device.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     "homepage_uri" => spec.homepage,
     "source_code_uri" => spec.homepage,
-    "changelog_uri" => "#{spec.homepage}/blob/main/CHANGE_LOG.md"
+    "changelog_uri" => "#{spec.homepage}/blob/main/CHANGELOG.md"
   }
 
   # Specify which files should be added to the gem when it is released.
@@ -36,6 +36,4 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "lumberjack", ">=2.0"
   spec.add_dependency "syslog"
-
-  spec.add_development_dependency "bundler"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack_syslog_device
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Brian Durand
@@ -37,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 email:
 - bbdurand@gmail.com
 executables: []
@@ -60,7 +46,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/continuous_integration.yml"
 - ".standard.yml"
-- CHANGE_LOG.md
+- CHANGELOG.md
 - MIT_LICENSE.txt
 - README.md
 - VERSION
@@ -73,7 +59,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/bdurand/lumberjack_syslog_device
   source_code_uri: https://github.com/bdurand/lumberjack_syslog_device
-  changelog_uri: https://github.com/bdurand/lumberjack_syslog_device/blob/main/CHANGE_LOG.md
+  changelog_uri: https://github.com/bdurand/lumberjack_syslog_device/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -88,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A logging device for the lumberjack gem that writes log entries to syslog.
 test_files: []