gelf_redux 3.1.1 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a992294a97a00260cb881e3070cb3d47017fd7c60159d1795eb6fee4806514
-  data.tar.gz: 99b6aa9c799b284f231017d8d9b6bafee12ab5a81b68ab5611069349defac6d7
+  metadata.gz: a043e357efea39c53c0f6fa35fae048ff27b8832099d7cfd48b3e88c6083d4c2
+  data.tar.gz: 93c9d1d9d2ba69be361b8a7113f792d2a4663455438f0b613db776a5809fb7f0
 SHA512:
-  metadata.gz: b3b6eba5fc81cfeec6e306e24632568768102b4b395e603801c5c6cf45d560ba1bc7e437ae15f5dd5836dc9781eaa14b70007ba0b0caed1a0299438a93ba0eb9
-  data.tar.gz: d9e2658d0d6a1bc293875f401aaf2d8deffc37436242131ff2c400f6edac4e3cbb43256ea79d04c7440cd12181397c6c8c0e30d8545163e32072c7b9e8f79e94
+  metadata.gz: c4a3f550556b174a5970fd26c682f9d0107ad83e6f78fb3b6a00b6648cde8dae04c4c6c122d0dd15111ed64dc5d37e93dffcf1840070e18f7767ca805fd03c34
+  data.tar.gz: 31ec48b4986ae8b6328aaff7671908138e8570a45048d061a3c4c73a19c91dd5ed16167cea6589e7068b681da5a150a02b65ebe5bea51fde97407f676b620f9f

data/README.md

@@ -8,7 +8,7 @@ of the original project because we wanted to keep all of the projects and mainta
 ## Versioning
 
 - 3.1.1 is the latest original gelf-rb version ()
-- 3.2.0 is the first http(s) supporting version from here https://github.com/christianrolle/gelf-rb
+- 3.2.1 is the first http(s) supporting version from here https://github.com/christianrolle/gelf-rb
 - 4.0.0 we do start from here with our versioning, improvements and updates
 
 
@@ -16,7 +16,7 @@ of the original project because we wanted to keep all of the projects and mainta
 ## Usage
 ### Gelf::Notifier
 
-This allows you to sent arbitary messages via UDP to Graylog.
+This allows you to send arbitary messages via UDP to Graylog.
 
     n = GELF::Notifier.new("localhost", 12201)
 
@@ -60,6 +60,7 @@ Since it's compatible with the Logger interface, you can also use it in your Rai
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Run the tests with `bundle exec rake` 
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.

data/gelf.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "gelf_redux"
-  s.version = "3.1.1"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = ">= 1.9"
   s.require_paths = ["lib"]
-  s.authors = ["Alexey Palazhchenko", "Lennart Koopmann", "Zac Sprackett", "Marcus Ilgner", "Sebastian Seidel"]
+  s.authors = ["Alexey Palazhchenko", "Lennart Koopmann", "Zac Sprackett", "Marcus Ilgner", "Sebastian Seidel", "Christian Rolle"]
   s.date = "2023-06-19"
-  s.description = "Library to send GELF messages to Graylog logging server. Supports plain-text, GELF messages and exceptions via UDP and TCP."
+  s.description = "Library to send GELF messages to Graylog logging server. Supports plain-text, GELF messages and exceptions via UDP, TCP and HTTPS"
   s.email = "admins@manet-marketing.de"
   s.extra_rdoc_files = [
     "LICENSE",
@@ -46,6 +46,9 @@ Gem::Specification.new do |s|
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('3.2.0') then
+      s.add_development_dependency(%q<typhoeus>, ["~> 1.4.0"])
+    end
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
       s.add_development_dependency(%q<rack>, ["< 2.0"])

data/lib/gelf/notifier.rb

@@ -1,6 +1,7 @@
 require 'gelf/transport/udp'
 require 'gelf/transport/tcp'
 require 'gelf/transport/tcp_tls'
+require 'gelf/transport/https'
 
 # replace JSON and #to_json with Yajl if available
 begin
@@ -135,6 +136,8 @@ module GELF
   private
 
     def create_sender(host, port)
+      return create_https(host, port) if default_options['protocol'] == GELF::Protocol::HTTPS
+
       addresses = [[host, port]]
       if default_options['protocol'] == GELF::Protocol::TCP
         if default_options.key?('tls')
@@ -148,6 +151,10 @@ module GELF
       end
     end
 
+    def create_https(host, port)
+      GELF::Transport::HTTPS.new host, port: port, path: default_options.delete('path')
+    end
+
     def notify_with_level(message_level, *args)
       notify_with_level!(message_level, *args)
     rescue SocketError, SystemCallError
@@ -161,6 +168,8 @@ module GELF
       hash = extract_hash(*args)
       hash['level'] = message_level unless message_level.nil?
       if hash['level'] >= level
+        return @sender.transfer(hash) if default_options['protocol'] == GELF::Protocol::HTTPS
+
         if default_options['protocol'] == GELF::Protocol::TCP
           validate_hash(hash)
           @sender.send(hash.to_json + "\0")

data/lib/gelf.rb

@@ -8,6 +8,7 @@ module GELF
   module Protocol
     UDP = 0
     TCP = 1
+    HTTPS = 2
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gelf_redux
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.1
 platform: ruby
 authors:
 - Alexey Palazhchenko
@@ -9,6 +9,7 @@ authors:
 - Zac Sprackett
 - Marcus Ilgner
 - Sebastian Seidel
+- Christian Rolle
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -85,7 +86,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Library to send GELF messages to Graylog logging server. Supports plain-text,
-  GELF messages and exceptions via UDP and TCP.
+  GELF messages and exceptions via UDP, TCP and HTTPS
 email: admins@manet-marketing.de
 executables: []
 extensions: []