smart_proxy_discovery_image 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e9e8345ac2b1139379f5afc7d0b617258afc2e2
-  data.tar.gz: fbf8485197642a9fb8e0ed9b36ecdfdc04bcc4e2
+  metadata.gz: e4dc7cb1398ac217438e11f78f53d58526a2c295
+  data.tar.gz: 1724af6417967817b778f7529996ab85a6d6650b
 SHA512:
-  metadata.gz: ac98ab2e5b4cbf3d1dcea1c763e84d799d2860c46cf99a1d20e5d7560d493570fa302fda5ca6c1b5bbd0b029703fa704f5606bc496fdbc8c5d6389a2ba68a341
-  data.tar.gz: 2f6a15bccbf3533af192e2571495cd36adbb891491d81f612e4efc99918856e5db1c15c707b4b4e7c58da279f435944fafdde9004a2f1af8ff8130854e4858c3
+  metadata.gz: b8ee13bb9505903bff9c0c989ccd2daaf6d4cec08f8efccf4b7e52759f03c4b1cd8814276c32e812d95b06831a800cc97c00f4d625482ca524c2d30e14bbc68e
+  data.tar.gz: 738479e7aebcdd9a8e2f8cc653cdc231c2bd3b9e4c112446ff2d7993fd90242eef3de427d6389021efde1d0943ec660a76078acfac0dd0a29c530ed92ed0f5eb

data/lib/smart_proxy_discovery_image/power_api.rb

@@ -7,16 +7,21 @@ module Proxy::DiscoveryImage
     include Proxy::Util
 
     put "/reboot" do
-      log_halt 500, "shutdown binary was not found" unless (shutdown = which('shutdown'))
+      log_halt(500, "shutdown binary was not found") unless (shutdown = which('shutdown'))
       run_after_response 5, shutdown, "-r", "now", "Foreman Power API reboot"
       content_type :json
       { :result => true }.to_json
     end
 
     put "/kexec" do
-      log_halt 500, "kexec binary was not found" unless (kexec = which('kexec'))
-      data = JSON.parse request.body.read
-
+      body_data = request.body.read
+      logger.debug "Initiated kexec provisioning with #{body_data}"
+      log_halt(500, "kexec binary was not found") unless (kexec = which('kexec'))
+      begin
+        data = JSON.parse body_data
+      rescue JSON::ParserError
+        log_halt 500, "Unable to parse kexec JSON input: #{body_data}"
+      end
       logger.debug "Downloading: #{data['kernel']}"
       if ::Proxy::HttpDownload.new(data['kernel'], '/tmp/vmlinuz').start.join != 0
         log_halt 500, "cannot download kernel for kexec!"
@@ -33,7 +38,7 @@ module Proxy::DiscoveryImage
     # Execute command in a separate thread after 5 seconds to give the server some
     # time to finish the request. Does *not* execute via a shell.
     def run_after_response(seconds, *command)
-      logger.debug "Power API command scheduled in #{seconds} seconds"
+      logger.debug "Power API scheduling in #{seconds} seconds: #{command.inspect}"
       Thread.start do
         begin
           sleep seconds

data/lib/smart_proxy_discovery_image/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module DiscoveryImage
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_discovery_image
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Lukas Zapletal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Smart Proxy plugin providing Image API on discovered nodes. This plugin is only
@@ -32,7 +32,7 @@ files:
 - settings.d/discovery_image.yml.example
 homepage: http://github.com/theforeman/smart_proxy_discovery_image
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []