smart_proxy_dynflow_core 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5742c7365ff184933fcacedca67dec98085b1b41
-  data.tar.gz: 31049cda89e6ccb7e4d467f3566b44fe9614bb57
+  metadata.gz: b0d120d38258eec260af438b2eadf540a2015236
+  data.tar.gz: a2d72f30ab1d4e7e31249f9273d5b630b4277966
 SHA512:
-  metadata.gz: 15c260cd39034346bde7e66240d61210607406b41b3609ec41db1d3f76f16854f58a0ca773f112c5cd6f02c13292551b2f94a64d691f50de6f5eee9aec8505ee
-  data.tar.gz: 4d119c22a2e8a1e888a732d4f0456195733aafdb734ae0df592711146c07ae24c32514bdeb1e41e06a7bff551074d91ac5df62b1c8c81d78c7ba58073a297ea8
+  metadata.gz: 67325b2dbb85f4c7a6cefcd61fc4e6b39ff529ae6478da19e32b583f347435f6cba301f9606ea6d7699557d218ac8e37701fee8009b4ec1dc9e8f24b70783183
+  data.tar.gz: f1ff5e54f435e69080a61c28727ec77ae68506e902bc8a3df36e170f6e827a8eb42c95093267b4d3a4a7175e8bdd813dcce454e7123e7411aba8b62e84de8803

data/Gemfile

@@ -3,11 +3,13 @@ source 'https://rubygems.org'
 gemspec :name => 'smart_proxy_dynflow_core'
 
 group :development do
-  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
   gem 'pry'
 end
 
-gem 'smart_proxy_dynflow', :path => '.'
+group :test do
+  gem 'smart_proxy_dynflow', :path => '.'
+  gem 'smart_proxy', :git => "https://github.com/theforeman/smart-proxy", :branch => "develop"
+end
 
 # load local gemfile
 local_gemfile = File.join(File.dirname(__FILE__), 'Gemfile.local.rb')

data/bundler.d/Gemfile.local.rb

@@ -0,0 +1,2 @@
+gem 'pry'
+gem 'smart_proxy_remote_execution_ssh_core', :path => '../smart_proxy_remote_execution_ssh'

data/config/settings.yml.example

@@ -16,3 +16,5 @@
 # :ssl_ca_file: ssl/ca.pem
 # :ssl_private_key: ssl/localhost.pem
 # :ssl_certificate: ssl/certs/localhost.pem
+
+# :log_file: /var/log/foreman-proxy/smart_proxy_dynflow_core.log

data/deploy/smart_proxy_dynflow_core.init

@@ -0,0 +1,95 @@
+#!/bin/bash
+#
+# Init script for foreman smart proxy dynflow core service
+#
+# chkconfig: - 85 15
+# description: Init script for foreman proxy dynflow core service
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+prog=smart_proxy_dynflow_core
+RETVAL=0
+SMART_PROXY_DYNFLOW_SCL_ROOT=/opt/theforeman/tfm/root
+SMART_PROXY_DYNFLOW_CORE_PID=${SMART_PROXY_DYNFLOW_SCL_ROOT}/var/run/$prog/$prog.pid
+SMART_PROXY_DYNFLOW_CORE_USER=${SMART_PROXY_DYNFLOW_CORE_USER:-foreman-proxy}
+
+. /opt/theforeman/tfm/service-environment
+. scl_source enable $TFM_SCLS_ENABLED
+
+start() {
+    echo -n $"Starting $prog: "
+    daemon --user ${SMART_PROXY_DYNFLOW_CORE_USER} ${SMART_PROXY_DYNFLOW_SCL_ROOT}/usr/bin/smart_proxy_dynflow_core > /dev/null
+    RETVAL=$?
+    if [ $RETVAL = 0 ]
+    then
+        echo_success
+    else
+        echo_failure
+    fi
+
+    echo
+    return $RETVAL
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    if [ -f ${SMART_PROXY_DYNFLOW_CORE_PID} ]; then
+        killproc -p ${SMART_PROXY_DYNFLOW_CORE_PID}
+        RETVAL=$?
+    else
+        echo -n $"$prog was not running.";
+        failure $"$prog was not running.";
+        echo
+        return 1
+    fi
+    echo
+    [ $RETVAL -eq 0 ] && rm -f ${SMART_PROXY_DYNFLOW_CORE_PID}
+    return $RETVAL
+}
+
+logrotate() {
+    echo -n $"Rotating logs for $prog: "
+    if [ -f ${SMART_PROXY_DYNFLOW_CORE_PID} ]; then
+        killproc -p ${SMART_PROXY_DYNFLOW_CORE_PID} $prog -USR1
+        RETVAL=$?
+        echo
+    else
+        echo -n $"$prog was not running.";
+        failure $"$prog was not running.";
+        echo
+        return 1
+    fi
+    return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+    start)
+        start
+    ;;
+    stop)
+        stop
+    ;;
+    status)
+        echo -n "$prog"
+        status -p $SMART_PROXY_DYNFLOW_CORE_PID
+        RETVAL=$?
+    ;;
+    restart)
+        stop
+        start
+    ;;
+    condrestart)
+        stop
+        [ $? -eq 0 ] && start
+    ;;
+    logrotate)
+        logrotate
+    ;;
+    *)
+        echo $"Usage: $prog {start|stop|restart|condrestart|logrotate}"
+        exit 1
+esac
+
+exit $RETVAL

data/deploy/smart_proxy_dynflow_core.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Foreman smart proxy dynflow core service
+Documentation=https://github.com/theforeman/smart_proxy_dynflow
+After=network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+User=foreman-proxy
+PIDFile=/opt/theforeman/tfm/root/var/run/smart_proxy_dynflow_core/smart_proxy_dynflow_core.pid
+EnvironmentFile=/opt/theforeman/tfm/service-environment
+ExecStart=/usr/bin/scl enable $TFM_SCLS_ENABLED -- /opt/theforeman/tfm/root/usr/bin/smart_proxy_dynflow_core
+
+[Install]
+WantedBy=multi-user.target

data/lib/smart_proxy_dynflow_core.rb

@@ -1,3 +1,4 @@
+require 'smart_proxy_dynflow_core/log'
 require 'smart_proxy_dynflow_core/settings'
 require 'smart_proxy_dynflow_core/core'
 require 'smart_proxy_dynflow_core/helpers'

data/lib/smart_proxy_dynflow_core/api.rb

@@ -7,6 +7,7 @@ module SmartProxyDynflowCore
     helpers Helpers
 
     before do
+      logger = Log.instance
       authorize_with_ssl_client
       content_type :json
     end

data/lib/smart_proxy_dynflow_core/core.rb

@@ -18,8 +18,7 @@ module SmartProxyDynflowCore
 
       db_file = Settings.instance.database
       if db_file.nil? || db_file.empty?
-        # TODO: Use some kind of logger
-        STDERR.puts "Could not open DB for dynflow at '#{db_file}', will keep data in memory. Restart will drop all dynflow data."
+        Log.instance.warn "Could not open DB for dynflow at '#{db_file}', will keep data in memory. Restart will drop all dynflow data."
       else
         db_conn_string += "/#{db_file}"
       end
@@ -41,7 +40,11 @@ module SmartProxyDynflowCore
     end
 
     def logger_adapter
-      ::Dynflow::LoggerAdapters::Simple.new $stderr, 0
+      if Settings.instance.standalone
+        Log::ProxyAdapter.new(Log.instance, Log.instance.level)
+      else
+        Log::ProxyAdapter.new(Proxy::LogBuffer::Decorator.instance, Log.instance.level)
+      end
     end
 
     class << self

data/lib/smart_proxy_dynflow_core/helpers.rb

@@ -8,14 +8,11 @@ module SmartProxyDynflowCore
       if %w(yes on 1).include? request.env['HTTPS'].to_s
         if request.env['SSL_CLIENT_CERT'].to_s.empty?
           status 403
-          # TODO: Use a logger
-          STDERR.puts "No client SSL certificate supplied"
+          Log.instance.error "No client SSL certificate supplied"
           halt MultiJson.dump(:error => "No client SSL certificate supplied")
         end
       else
-        # TODO: Use a logger
-        # logger.debug('require_ssl_client_verification: skipping, non-HTTPS request')
-        puts 'require_ssl_client_verification: skipping, non-HTTPS request'
+        Log.instance.debug 'require_ssl_client_verification: skipping, non-HTTPS request'
       end
     end
 

data/lib/smart_proxy_dynflow_core/launcher.rb

@@ -27,6 +27,7 @@ module SmartProxyDynflowCore
       possible_config_dirs.select { |config_dir| File.directory? config_dir }.each do |config_dir|
         break if load_config_dir(config_dir) && one_config
       end
+      Settings.loaded!
     end
 
     def self.route_mapping(rack_builder)
@@ -43,12 +44,10 @@ module SmartProxyDynflowCore
 
     def rack_settings
       settings = if https_enabled?
-                   # TODO: Use a logger
-                   puts "Using HTTPS"
+                   Log.instance.debug "Using HTTPS"
                    https_app
                  else
-                   # TODO: Use a logger
-                   puts "Using HTTP"
+                   Log.instance.debug "Using HTTP"
                    {}
                  end
       settings.merge(base_settings)
@@ -65,7 +64,9 @@ module SmartProxyDynflowCore
         :app => app,
         :Host => Settings.instance.listen,
         :Port => Settings.instance.port,
-        :daemonize => false
+        :daemonize => false,
+        :AccessLog => [[Log.log_file, WEBrick::AccessLog::COMMON_LOG_FORMAT]],
+        :Logger => Log.instance
       }
     end
 
@@ -94,26 +95,21 @@ module SmartProxyDynflowCore
     def ssl_private_key
       OpenSSL::PKey::RSA.new(File.read(Settings.instance.ssl_private_key))
     rescue Exception => e
-      # TODO: Use a logger
-      STDERR.puts "Unable to load private SSL key. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
-      # logger.error "Unable to load private SSL key. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
+      Log.instance.fatal "Unable to load private SSL key. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
       raise e
     end
 
     def ssl_certificate
       OpenSSL::X509::Certificate.new(File.read(Settings.instance.ssl_certificate))
     rescue Exception => e
-      # TODO: Use a logger
-      STDERR.puts "Unable to load SSL certificate. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
-      # logger.error "Unable to load SSL certificate. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
+      Log.instance.fatal "Unable to load SSL certificate. Are the values correct in settings.yml and do permissions allow reading?: #{e}"
       raise e
     end
 
     def load_config_dir(dir)
       settings_yml = File.join(dir, 'settings.yml')
       if File.exist? settings_yml
-        # TODO: Use a logger
-        puts "Loading settings from #{dir}"
+        Log.instance.debug "Loading settings from #{dir}"
         Settings.load_global_settings settings_yml
         Dir[File.join(dir, 'settings.d', '*.yml')].each { |path| Settings.load_plugin_settings(path) }
         true

data/lib/smart_proxy_dynflow_core/log.rb

@@ -0,0 +1,54 @@
+require 'logger'
+require 'dynflow'
+
+module SmartProxyDynflowCore
+  class Log < ::Logger
+
+    alias_method :write, :debug
+
+    class << self
+      def instance
+        if @logger.nil?
+          @logger = Logger.new log_file
+          @logger.level = log_level
+        end
+        @logger
+      end
+
+      def instance=(logger)
+        @logger = logger
+      end
+
+      def reload!
+        @logger = nil
+        instance
+      end
+
+      def log_level
+        if Settings.instance.loaded && Settings.instance.log_level
+          ::Logger.const_get(Settings.instance.log_level.upcase)
+        else
+          Logger::WARN
+        end
+      end
+
+      def log_file
+        if Settings.instance.loaded && Settings.instance.log_file
+          Settings.instance.log_file
+        else
+          $stdout
+        end
+      end
+    end
+
+    class ProxyAdapter < ::Dynflow::LoggerAdapters::Simple
+      def initialize(logger, level = Logger::DEBUG, formatters = [::Dynflow::LoggerAdapters::Formatters::Exception])
+        @logger           = logger
+        @logger.level     = level
+        @logger.formatter = method(:formatter).to_proc
+        @action_logger    = apply_formatters ProgNameWrapper.new(@logger, ' action'), formatters
+        @dynflow_logger   = apply_formatters ProgNameWrapper.new(@logger, 'dynflow'), formatters
+      end
+    end
+  end
+end

data/lib/smart_proxy_dynflow_core/settings.rb

@@ -15,9 +15,16 @@ module SmartProxyDynflowCore
         :ssl_private_key => nil,
         :ssl_certificate => nil,
         :standalone => false,
-        :plugins => {}
+        :log_file => '/var/log/foreman-proxy/smart_proxy_dynflow_core.log',
+        :log_level => :ERROR,
+        :plugins => {},
+        :loaded => false
     }
 
+    PROXY_SETTINGS = [:ssl_certificate, :ssl_ca_file, :ssl_private_key, :foreman_url,
+                      :log_file, :log_level]
+    PLUGIN_SETTINGS = [:database, :core_url, :console_auth]
+
     def initialize(settings = {})
       super(DEFAULT_SETTINGS.merge(settings))
     end
@@ -34,15 +41,22 @@ module SmartProxyDynflowCore
       end
     end
 
+    def self.loaded!
+      Settings.instance.loaded = true
+      Log.instance.info 'Settings loaded, reloading logger'
+      Log.reload!
+    end
+
     def self.load_from_proxy(plugin)
-      [:ssl_certificate, :ssl_ca_file, :ssl_private_key, :foreman_url].each do |key|
+      PROXY_SETTINGS.each do |key|
         SETTINGS[key] = Proxy::SETTINGS[key]
       end
       SETTINGS.callback_url = SETTINGS.foreman_url
-      [:database, :core_url, :console_auth].each do |key|
+      PLUGIN_SETTINGS.each do |key|
         SETTINGS[key] = plugin.settings[key]
       end
       SETTINGS.plugins.values.each { |plugin| plugin.load_settings_from_proxy }
+      Settings.loaded!
     end
 
     def self.load_plugin_settings(path)

data/lib/smart_proxy_dynflow_core/version.rb

@@ -1,3 +1,3 @@
 module SmartProxyDynflowCore
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow_core
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: "    Use the Dynflow inside Foreman smart proxy\n"
+description: |2
+      Use the Dynflow inside Foreman smart proxy
 email:
 - inecas@redhat.com
 executables: []
@@ -202,8 +203,11 @@ files:
 - Gemfile
 - LICENSE
 - bin/smart_proxy_dynflow_core
+- bundler.d/Gemfile.local.rb
 - bundler.d/dynflow.rb
 - config/settings.yml.example
+- deploy/smart_proxy_dynflow_core.init
+- deploy/smart_proxy_dynflow_core.service
 - lib/smart_proxy_dynflow_core.rb
 - lib/smart_proxy_dynflow_core/api.rb
 - lib/smart_proxy_dynflow_core/bundler_helper.rb
@@ -211,6 +215,7 @@ files:
 - lib/smart_proxy_dynflow_core/core.rb
 - lib/smart_proxy_dynflow_core/helpers.rb
 - lib/smart_proxy_dynflow_core/launcher.rb
+- lib/smart_proxy_dynflow_core/log.rb
 - lib/smart_proxy_dynflow_core/settings.rb
 - lib/smart_proxy_dynflow_core/testing.rb
 - lib/smart_proxy_dynflow_core/version.rb
@@ -234,9 +239,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Dynflow runtime for Foreman smart proxy
 test_files: []
-has_rdoc: