xmlconv 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fdfd91d268508538bfd8c63a8b30feab9ba86f2
-  data.tar.gz: 1b7924f306ca65f665893d72b08c1c1931b71066
+  metadata.gz: b944e983c5846919a052589ef034b9f3213f87a7
+  data.tar.gz: 886ccc0284adc4c66a48efd6f0a5f9f59ce5866f
 SHA512:
-  metadata.gz: 4ad2412d99bd3fa72cf25a88f77247f68f3dc1fa579085d1f5e49a0c75cdf98c312f520536f7082580f0443031681cbe4ed5294132eef2cb0a88c886ddc2694d
-  data.tar.gz: 6e1035617e80f3557f8d51329ec29d7c1cf56794c6d7dcba6ad3b0923b027366d23bde21c4a294e2bd4047f0bc0c39138b5bb8110b0970786b8c7d1a8f294dff
+  metadata.gz: 34d6f9ca0710e0c360f36e4167626c6afea002881ee15eacc31b786300f5f41d8aee21a649e392e4c4f865457cbe7a10cec27f778d7b882ebf94b53e14d88979
+  data.tar.gz: b9a1eee2de8c25e0507da64e8621850126bae94b86a54a38c580b25703ac205b3c9859a50677fe7b9250335d7003f7224d9dc2411ec7b2f25ffe33e90338368c

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.6 / 20.06.2017
+
+* Trace transaction handling via SBSM.debug
+
 === 1.1.5 / 14.06.2017
 
 * Prepend http:// to transaction origin

data/lib/xmlconv/state/login.rb

@@ -12,8 +12,9 @@ module XmlConv
 			VIEW = View::Login
       def initialize(session, model)
         if session.request_method.eql?('POST')
-          session.request_params
-          xml_src = "#{session.request_params.keys.first} #{session.request_params.values.first}"
+          xml_src = session.post_content
+          SBSM.debug "XmlConv::State::Login POST params were #{session.request_params}"
+          SBSM.debug " xml_src now #{xml_src}"
           unless xml_src.length == 0
             transaction = XmlConv::Util::Transaction.new
             transaction.domain      = session.server_name

data/lib/xmlconv/util/application.rb

@@ -38,18 +38,26 @@ module XmlConv
 			rescue Exception => error
 				## survive notification failure
 			end
-			def _execute(transaction)
-				transaction.transaction_id = next_transaction_id
-				transaction.execute
-        transaction.postprocess
-			rescue Exception => error
-				transaction.error = error
+      def _execute(transaction)
+        has_error = false
+        transaction.transaction_id = next_transaction_id
+        SBSM.info "Starting_transaction #{transaction.transaction_id}"
+        transaction.execute
+        res = transaction.postprocess
+        SBSM.info "Postprocessed_transaction #{transaction.transaction_id} res #{res.class}"
+        res
+      rescue Exception => error
+        has_error = true
+        SBSM.info "error_transaction #{transaction.transaction_id} error #{error} \n#{error.backtrace}"
+        transaction.error = error
       ensure
-        ODBA.transaction {
+        res = ODBA.transaction {
           transaction.odba_store
           @transactions.push(transaction)
           @transactions.odba_isolated_store
         }
+        SBSM.info "has_error_transaction is #{has_error} #{transaction.transaction_id} res is #{res.class}" if has_error
+        res
       end
 			def next_transaction_id
 				@id_mutex.synchronize {
@@ -122,7 +130,7 @@ class XmlConvApp < SBSM::AdminServer
   POLLING_INTERVAL = 60 #* 15
 	def initialize(app: XmlConv::Util::RackInterface.new)
     @rack_app = app
-    super(app: app)
+    super(app: app) # TODO?? , multi_threaded: true)
 		@persistence_layer = ODBA.cache.fetch_named('XmlConv', self) do XmlConv::Util::Application.new end
 		@persistence_layer.init
 		@dispatch_queue = Queue.new

data/lib/xmlconv/util/mail.rb

@@ -12,7 +12,6 @@ module Mail
     recipients.compact!
     recipients.uniq!
     return if(recipients.empty?)
-    puts "XmlConv::Util::Mail.notify #{ XmlConv::CONFIG.mail_from} -> #{recipients} subject: #{my_subject}"
     options = { :address              => XmlConv::CONFIG.smtp_server,
                 :port                 => XmlConv::CONFIG.smtp_port,
                 :domain               => XmlConv::CONFIG.smtp_domain,
@@ -24,6 +23,8 @@ module Mail
     ::Mail.defaults do
       delivery_method :smtp, options
     end unless ::Mail.delivery_method.is_a?(::Mail::TestMailer)
+    msg = "XmlConv::Util::Mail.notify #{ XmlConv::CONFIG.mail_from} -> #{recipients} subject: #{my_subject}\n #{options}"
+    puts msg; SBSM.info(msg)
     mail = ::Mail.deliver do
       from XmlConv::CONFIG.mail_from
       to recipients

data/lib/xmlconv/util/polling_manager.rb

@@ -173,7 +173,11 @@ module XmlConv
 			def initialize(system)
 				@system = system
 			end
-			def load_sources(&block)
+      def load_sources(&block)
+        unless File.exist?(CONFIG.polling_file)
+          SBSM.warn("Could not find #{CONFIG.polling_file}. Skip polling")
+          return
+        end
 				file = File.open(CONFIG.polling_file)
 				YAML.load_documents(file) { |mission|
 					block.call(mission)
@@ -182,8 +186,10 @@ module XmlConv
 				file.close if(file)
 			end
 			def poll_sources
+        @@showed_content ||= false
 				load_sources do |source|
           begin
+            SBSM.info "PollingManage has source #{source.inspect}" unless @@showed_content
             source.poll { |transaction|
               @system.execute(transaction)
             }
@@ -197,6 +203,7 @@ module XmlConv
             Util::Mail.notify source.error_recipients, subject, body
           end
         end
+        @@showed_content = true
 			end
 		end
 	end

data/lib/xmlconv/util/rack_interface.rb

@@ -23,7 +23,7 @@ module XmlConv
         @app = app
         super(app: app,
               session_class: XmlConv::Util::Session,
-              unknown_user: XmlConv::Util::KnownUser,
+              unknown_user: XmlConv::Util::KnownUser.new,
               validator: validator,
               cookie_name: 'virbac.bbmb'
               )

data/lib/xmlconv/util/transaction.rb

@@ -37,6 +37,7 @@ module XmlConv
 				@model = reader_instance.convert(input_model, *@arguments)
 				output_model = writer_instance.convert(@model, *@arguments)
 				@output = output_model.is_a?(Array) ? output_model.join("\n").to_s : output_model.to_s
+        SBSM.info("_execute #{input_model.class} => #{@output} #{@destination.inspect}")
 				@destination.deliver(output_model)
 				@commit_time = Time.now
 				@output
@@ -103,11 +104,13 @@ Output:
       end
       def postprocess
         if(@postprocs.respond_to?(:each))
-          @postprocs.each { |klass, *args|
+          @postprocs.each do |klass, *args|
             next if args.empty?
+            SBSM.info(msg = "Postprocess calling for klass #{klass} #{args.inspect}")
             args.push(self)
-            PostProcess.const_get(klass).send(*args)
-          }
+            res = PostProcess.const_get(klass).send(*args)
+            SBSM.info(msg = "Postprocess returned #{res} for klass #{klass}")
+          end
         end
       end
       def respond delivery, response

data/lib/xmlconv/version.rb

@@ -1,3 +1,3 @@
 module XmlConv
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/test/test_util/application.rb

@@ -38,6 +38,7 @@ module XmlConv
         cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:transaction_id)
         transaction.should_receive(:execute).once.and_return(transaction)
         transaction.should_receive(:postprocess).once
         transaction.should_receive(:error=).never
@@ -57,6 +58,7 @@ module XmlConv
         cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:transaction_id)
         transaction.should_receive(:execute).once.and_raise(Net::SMTPFatalError, 'could not send email')
         transaction.should_receive(:postprocess).never
         transaction.should_receive(:error=).never
@@ -75,6 +77,7 @@ module XmlConv
         cache.should_receive(:store).with(@app.transactions)
 				ODBA.cache = cache
         transaction.should_receive(:transaction_id=).with(1)
+        transaction.should_receive(:transaction_id)
         transaction.should_receive(:execute).and_raise 'oops, something went wrong'
         transaction.should_receive(:postprocess).never
         transaction.should_receive(:error=).once

data/xmlconv.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.1'
   spec.add_dependency "ydbi",    '>= 0.5.1'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm", '>= 1.4.4'
+  spec.add_dependency "sbsm", '>= 1.4.5'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim"
   spec.add_dependency "syck"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlconv
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.4.5
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement