prometheus-splash 0.3.0 → 0.4.0

data/lib/splash/orchestrator/grammar.rb

@@ -4,7 +4,15 @@ module Splash
     module Grammar
 
       include Splash::Config
-      VERBS=[:ping,:list_commands,:execute_command,:ack_command]
+      include Splash::Loggers
+
+
+      VERBS=[:ping,:list_commands,:execute_command,:ack_command, :shutdown]
+
+
+      def shutdown
+        self.terminate
+      end
 
       def ping(payload)
         return "Pong : #{payload[:hostname]} !"
@@ -22,21 +30,20 @@ module Splash
 
       def execute_command(payload)
         unless get_config.commands.include? payload[:name].to_sym
-          puts " * Command not found"
+          @log.item "Command not found"
           return { :case => :not_found }
         end
         if payload.include? :schedule then
           sched,value = payload[:schedule].flatten
-          puts " * Schedule remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}"
+          @log.schedule "remote call command #{payload[:name]}, scheduling : #{sched.to_s} #{value}"
           @server.send sched,value do
+            @log.trigger "Executing Scheduled command #{payload[:name]} for Scheduling : #{sched.to_s} #{value}"
             self.execute command: payload[:name]
           end
           return { :case => :quiet_exit }
         else
-          puts " * Execute direct command"
-          puts payload[:name]
+          @log.info "Execute direct command"
           res = self.execute command: payload[:name]
-          puts res.inspect
           return res
         end
       end

data/lib/splash/transports.rb

@@ -16,7 +16,7 @@ module Splash
       begin
         return Kernel.const_get(aclass)::new(options)
       rescue
-        return { :case => :configuration_error, :more => "Transport specified for queue #{options[:queue]} inexistant : #{transport}"}
+        return { :case => :configuration_error, :more => "Transport specified for queue #{options[:queue]} configuration error : #{transport}"}
       end
     end
 
@@ -32,7 +32,7 @@ module Splash
       begin
         return Kernel.const_get(aclass)::new
       rescue
-        return { :case => :configuration_error, :more => "Transport specified inexistant : #{transport}"}
+        return { :case => :configuration_error, :more => "Transport configuration error : #{transport}"}
       end
     end
 

data/lib/splash/transports/rabbitmq.rb

@@ -11,9 +11,15 @@ module Splash
 
         def initialize(options = {})
           @config = get_config.transports
+          @url = "amqp://"
           host = @config[:rabbitmq][:host]
           port = @config[:rabbitmq][:port]
-          @url = "amqp://#{host}:#{port}"
+          vhost = @config[:rabbitmq][:vhost]
+          if @config[:rabbitmq][:user] and @config[:rabbitmq][:passwd] then
+            creds = "#{@config[:rabbitmq][:user]}:#{@config[:rabbitmq][:passwd]}@"
+            @url << creds
+          end
+          @url << "#{host}:#{port}#{vhost}"
           begin
             @connection = Bunny.new url: @url
             @connection.start
@@ -31,12 +37,19 @@ module Splash
       class Client
         include Splash::Config
         include Splash::Transports
+        include Splash::Loggers
 
         def initialize
           @config = get_config.transports
+          @url = "amqp://"
           host = @config[:rabbitmq][:host]
           port = @config[:rabbitmq][:port]
-          @url = "amqp://#{host}:#{port}"
+          vhost = @config[:rabbitmq][:vhost]
+          if @config[:rabbitmq][:user] and @config[:rabbitmq][:passwd] then
+            creds = "#{@config[:rabbitmq][:user]}:#{@config[:rabbitmq][:passwd]}@"
+            @url << creds
+          end
+          @url << "#{host}:#{port}#{vhost}"
           begin
             @connection = Bunny.new url: @url
             @connection.start
@@ -69,6 +82,7 @@ module Splash
 
             lock.synchronize { condition.signal }
           end
+          get_logger.send "Verb : #{order[:verb].to_s} to queue : #{order[:queue]}."
           get_default_client.publish queue: order[:queue], message: order.to_yaml
           lock.synchronize { condition.wait(lock) }
           return res

data/prometheus-splash.gemspec

@@ -25,7 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'redis','~> 4.1.3'
   spec.add_runtime_dependency 'bunny','~> 2.15.0'
   spec.add_runtime_dependency 'tty-markdown','~> 0.6.0'
-  spec.add_runtime_dependency 'tty-pager','~> 0.12.1' 
+  spec.add_runtime_dependency 'tty-pager','~> 0.12.1'
+  spec.add_runtime_dependency 'colorize','~> 0.8.1'
   spec.add_development_dependency 'rake', '~> 13.0.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'
   spec.add_development_dependency 'yard', '~> 0.9.24'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-splash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Romain GEORGES
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-11 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.1
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +229,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
+- CHANGELOG
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -223,6 +239,7 @@ files:
 - assets/images/logo_splash.png
 - assets/images/logo_splash_reduce.png
 - assets/images/prom_pg_logs.png
+- assets/images/splash_design.png
 - bin/splash
 - config/splash.yml
 - lib/splash/backends.rb
@@ -243,6 +260,10 @@ files:
 - lib/splash/dependencies.rb
 - lib/splash/exiter.rb
 - lib/splash/helpers.rb
+- lib/splash/loggers.rb
+- lib/splash/loggers/cli.rb
+- lib/splash/loggers/daemon.rb
+- lib/splash/loggers/dual.rb
 - lib/splash/logs.rb
 - lib/splash/orchestrator.rb
 - lib/splash/orchestrator/grammar.rb