logster 2.9.6 → 2.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f7af959f601d0015cd062cf6303134c05101c70dee6050665dd7c812b04e5fb
-  data.tar.gz: 3a0439891b28bb2ddca56b286d0cb5ea8dcbcc37144040fe9d83a850a32b78dd
+  metadata.gz: 057b84d003670451a106018f1a460150f20a92059f4b50e25db59774459f8a7b
+  data.tar.gz: 19ddbb573c579a965ef5fab006b56b5fd9139f37382df7f2990a95522eb041c6
 SHA512:
-  metadata.gz: 0dee60ef65432e8f5deb7b39585a6574384189a3ead8177211b62821edb12dd7fd9eef1fd9cc3c1ca3e568115921b75c9aca9afe1e83f76c197d11a38626b8d0
-  data.tar.gz: f5631b96c324874ca987e5c783d474e20e4225df7b9f9988bb8922418dba9e37bb3c03c7ec224a777fdb4370963fc2dd7039a13e4c9a0aafc19fd3adebddcbf2
+  metadata.gz: d8bb2c8e2f217daeb13ab0bc94fd6cc047c13c65d2e9fc4af7ae0593ebdf63d035b333defcb00e989c80c4d0869cdb2373efe0ceceaa9c6906f2535a139b143d
+  data.tar.gz: 0e70666cc37cc8f1628bd778f5697a6ab0f2d9337f4ce33e0c46a558a6c039f032ea709127ed74860ff3ebfac06c1cd0dbe2fa0d6d82897620767b4ad88266d8

data/.github/workflows/ci.yml

@@ -1,54 +1,49 @@
-name: Logster Tests
+name: CI
 
 on:
+  pull_request:
   push:
     branches:
       - master
-  pull_request:
+      - main
 
 jobs:
-  ruby:
+  build:
     runs-on: ubuntu-latest
-    name: Ruby ${{ matrix.ruby }}
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
     strategy:
       matrix:
-        ruby: ["2.7", "2.6", "2.5"]
-        redis: ["4.x"]
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - uses: shogo82148/actions-setup-redis@v1
-        with:
-          redis-version: ${{ matrix.redis }}
-      - name: Bundler cache
-        uses: actions/cache@v2
-        with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.ruby }}-gems-
-      - name: Setup gems
-        run: |
-          gem install bundler
-          bundle config path vendor/bundle
-          bundle install --jobs 4
-      - name: Rubocop
+          bundler-cache: true
+
+      - name: Lint
         run: bundle exec rubocop
+
       - name: Tests
         run: bundle exec rake test
-  js:
-    runs-on: ubuntu-latest
-    name: JavaScript Lint
-    defaults:
-      run:
-        working-directory: client-app
-    steps:
-      - uses: actions/checkout@v2
+
       - name: Get yarn cache directory
         id: yarn-cache-dir
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - name: Yarn cache
         uses: actions/cache@v2
         id: yarn-cache
@@ -57,7 +52,24 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
+
       - name: Yarn install
-        run: yarn install
+        run: cd client-app && yarn install
+
       - name: ESLint
-        run: yarn eslint .
+        run: cd client-app && yarn eslint .
+
+  publish:
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+    needs: build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Release Gem
+        uses: discourse/publish-rubygems-action@v2-beta
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
+          GIT_EMAIL: team@discourse.org
+          GIT_NAME: discoursebot

data/.gitignore

@@ -1,21 +1 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.byebug_history
-.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml
-*.swo
-*.swp

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+- 2021-07-01: 2.9.7
+
+  - FEATURE: Optionally use full hostname
+
 - 2021-02-19: 2.9.6
 
   - UX: Make `Warn` level visible by default

data/lib/logster/configuration.rb

@@ -18,7 +18,8 @@ module Logster
       :gems_dir,
       :max_env_bytes,
       :max_env_count_per_message,
-      :maximum_message_length
+      :maximum_message_length,
+      :use_full_hostname
     )
 
     attr_writer :subdirectory
@@ -39,6 +40,7 @@ module Logster
       @enable_backtrace_links = true
       @gems_dir = Gem.dir + "/gems/"
       @maximum_message_length = 2000
+      @use_full_hostname = nil
 
       @allow_grouping = false
 

data/lib/logster/message.rb

@@ -80,7 +80,8 @@ module Logster
     end
 
     def self.hostname
-      @hostname ||= `hostname`.strip! rescue "<unknown>"
+      command = Logster.config.use_full_hostname ? `hostname -f` : `hostname`
+      @hostname ||= command.strip! rescue "<unknown>"
     end
 
     def populate_from_env(env)

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.9.6"
+  VERSION = "2.9.7"
 end

data/logster.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/discourse/logster"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.required_ruby_version = ">= 2.5.0"
+
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.start_with?("website") || f.start_with?("bin")
   end
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -33,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "byebug", "~> 11.1.0"
-  spec.add_development_dependency "rubocop-discourse"
+  spec.add_development_dependency "rubocop-discourse", "~> 2.4.1"
 end

data/test/logster/test_message.rb

@@ -78,6 +78,18 @@ class TestMessage < MiniTest::Test
     Logster.config.application_version = nil
   end
 
+  def test_use_full_hostname
+    Logster::Message.instance_variable_set(:@hostname, nil)
+    Logster.config.use_full_hostname = true
+    msg = Logster::Message.new(0, '', 'test', 10)
+    msg.populate_from_env({})
+
+    assert_equal(`hostname -f`.strip!, msg.env["hostname"])
+  ensure
+    Logster.config.use_full_hostname = nil
+    Logster::Message.instance_variable_set(:@hostname, nil)
+  end
+
   def test_merging_sums_count_for_both_messages
     msg1 = Logster::Message.new(0, '', 'test', 10, count: 15)
     msg2 = Logster::Message.new(0, '', 'test', 20, count: 13)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.9.7
 platform: ruby
 authors:
 - Sam Saffron
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,16 +126,16 @@ dependencies:
   name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.1
 description: UI for viewing logs in Rack
 email:
 - sam.saffron@gmail.com
@@ -280,7 +280,7 @@ homepage: https://github.com/discourse/logster
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -288,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: UI for viewing logs in Rack
 test_files: