r10k_gitlab_webhook 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3426f078d7f5f5e0ff5923d511331911011011
-  data.tar.gz: b858a4457dc4edf2691d4a2436832177ec4071a8
+  metadata.gz: a1475e5c1e036457110fc7247fe7cb3c1a921451
+  data.tar.gz: 01ea2fdc6c95a876712a4768ccf09433d39e7006
 SHA512:
-  metadata.gz: 42cd24a19582220b7843f5f10cac63da139f3ea3c39a390404eab5f563b4b32bca72dab068bcfd521e1afe56e117dffa5760870b4500118a15a69a96c5750804
-  data.tar.gz: 3ab17106d06a7de371e44370ee69f35687ac5ca85ee17d34872ea0fe2ced2555955f52089398d034783ecbf11fa7ec53988dffbd2c7f572465ff2fcf9c595eb0
+  metadata.gz: 5a13d8dafbdae1caf64f0f466dfe35e6ffb72ceb84e6506d51c006220629a25c47d5f4676fc2e6b396d7eef8e81302152864cc819c5f17831e22b41e50141aff
+  data.tar.gz: 79ce3868ba45fb89888bf19ad2517d7afbc82a7edc1aca513dc92697a6a1026b1ae330b7515229504399993e75f464fb3876d5afa1ab7fa38f05ff7445ac751c

data/bin/r10k_gitlab_webhook

@@ -1,13 +1,28 @@
 #!/usr/bin/env ruby
 require 'webrick'
 
-server = WEBrick::HTTPServer.new(:Port => ARGV.first)
+unless ARGV[1]
+  log_location = '/var/log'
+else
+  log_location = ARGV[1]
+end
+
+
+server = WEBrick::HTTPServer.new(
+  :Port => ARGV.first,
+  :Logger => WEBrick::Log.new("#{log_location}/r10k_gitlab_webhook_server.log",WEBrick::Log::INFO),
+  :AccessLog => [[File.open("#{log_location}/r10k_gitlab_webhook_access.log",'w'),WEBrick::AccessLog::COMBINED_LOG_FORMAT]]
+)
+
+r10k_comman_log = WEBrick::Log.new("#{log_location}/r10k_gitlab_webhook.log",WEBrick::Log::DEBUG)
+
 server.mount_proc '/' do |req, res|
-  r10kstatus = system( "sudo r10k deploy environment -pv warn" )
-  File.write('/var/log/r10k_gitlab_webhook.log', r10kstatus )
+
+  r10kstatus = `sudo r10k deploy environment -pv 2>&1`
+  r10k_comman_log.debug( r10kstatus )
 end
 
-trap 'INT' do 
-  server.shutdown 
+trap 'INT' do
+  server.shutdown
 end
 server.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r10k_gitlab_webhook
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Spencer Owen