cpee-logging-xes-yaml 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c27951cb51fe4d76a704f6b3d56c05503cfe760ebde414a2c6bfdb2991e2566d
-  data.tar.gz: e596c6b80c788fed3d1449da6398b4aeb19651894bc3f774b96928b31ab79a8d
+  metadata.gz: 840f6e5d3bf6287284ca354a275258376be5d367a85fe2047888b4c76b484c9c
+  data.tar.gz: 4821fdb1a463b36f492c0833daabb9a407dbdf8d61d451429f7008914a23377b
 SHA512:
-  metadata.gz: 70a342c2e56adcf99095d8cb9a0170719a3d4951dd3110c93b1f1adf871363a43d400be829344f8c41bc65e65827ef42118628863b2e545930e80975d90a578b
-  data.tar.gz: a01d079c9a8d6a4fb5aac1ddf10900ba9677ebe3d25a1b299c51d6eb8e2afce85001427bc7df85ca007cc7ffa709f5c5fff10fdeb9fee46b073f99bc97045fb7
+  metadata.gz: 193ef726d7884d694b156d000732e412ebc7bd4dd74bc4877587252c71e75871e4be6c315bce8c38d684dac5168a748a2f185bc2d9ffbab77da3b1dfd1a6b273
+  data.tar.gz: 896fb27beff7796afd1cb4cb240bb022f781be840fd6a1b1610b336b83eb922b0740dcef20daf948fef68c1ead5d9677b63f3b85c0c302f37566dc174522195d

data/AUTHORS

@@ -1,2 +1,4 @@
 Jürgen Mangler <juergen.mangler@gmail.com>
 Florian Stertz <florian.stertz@gmail.com>
+Matthias Ehrendorfer <matthias.ehrendorfer@gmail.com>
+Dominik Voigt <dominik.voigt@gmail.com>

data/README.md

@@ -14,7 +14,7 @@ host, or local-only access, ...), create a file log.conf and add one
 or many of the following yaml keys:
 
 ```yaml
- :port: 9250
+ :port: 9299
  :host: cpee.org
  :bind: 127.0.0.1
  :log_dir: /var/log/cpee

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.5.2"
+  s.version          = "1.5.4"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>=2.4.0'
 
-  s.authors          = ['Juergen eTM Mangler','Florian Stertz']
+  s.authors          = ['Juergen eTM Mangler','Florian Stertz','Matthias Ehrendorfer','Dominik Voigt']
 
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -210,10 +210,12 @@ module CPEE
         end
       end
 
+      event['time:timestamp'] = notification['timestamp'] || Time.now.xmlschema(4)
+
       if topic == 'task' && event_name == 'probe'
         rs = WEEL::ReadStructure.new(content['data'],{},{},{})
         rc = CPEE::Logging::extract_result(receiving) if receiving && !receiving.empty?
-        te = event.dup
+        te = event
 
         content['probes'].each do |p|
 
@@ -254,9 +256,6 @@ module CPEE
               end
               if te['stream:datastream'] && te['stream:datastream'].any?
                 te['cpee:lifecycle:transition'] = 'stream/data'
-                File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
-                  f << {'event' => te}.to_yaml
-                end
                 EM.defer do
                   self::notify(
                     opts,
@@ -274,19 +273,18 @@ module CPEE
           end
 
         end
-
-      end
-
-      if receiving && !receiving.empty?
-        event['data'] = receiving
-      end
-      if content['data'] && !content['data'].empty?
-        event['data'] = content['data']
+        event = nil if !event['stream:datastream']
+      else
+        if receiving && !receiving.empty?
+          event['data'] = receiving
+        end
+        if content['data'] && !content['data'].empty?
+          event['data'] = content['data']
+        end
       end
-      event['time:timestamp']= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
-      end
+      end unless event.nil? # :-) for task/probes
     end
 
   end

data/tools/cpee-logging-xes-yaml

@@ -190,11 +190,11 @@ def react(name,copy=false,deep=0,index=nil)
   end
 end
 
-def extract(path)
+def ropen(path)
   unlink = false
   if path =~ /^http.*/
     unlink = true
-    text = Tempfile.new('extract-model-download')
+    fhandle = Tempfile.new('extract-model-download')
     request = Typhoeus::Request.new(path)
     request.on_headers do |response|
       if response.code != 200
@@ -202,15 +202,20 @@ def extract(path)
       end
     end
     request.on_body do |chunk|
-      text.write(chunk)
+      fhandle.write(chunk)
     end
     request.on_complete do |response|
-      text.rewind
+      fhandle.rewind
     end
     request.run
   else
-    text = File.open(path)
+    fhandle = File.open(path)
   end
+  [fhandle,unlink]
+end
+
+def extract(path)
+  text, unlink = ropen(path)
   yaml = Psych.load_stream(text)
   changes = []
 
@@ -278,6 +283,8 @@ ARGV.options { |opt|
   opt.on(wrap("index [LOG]        creates an index for a log file, for more efficient parsing. When called without [LOG], indexes all log files in the current directory. Examples:\n#{exname} index https://cpee.org/log/123.xes.yaml\n#{exname} index ~/log/logs/456.xes.yaml"))
 	opt.on("")
   opt.on(wrap("to-xes-xml [LOG]   convert cpee xes-yaml to xes-xml. Works for local and remote logs. When called without [LOG], all log files in the current directory are converted. Examples:\n#{exname} to-xes-xml https://cpee.org/log/123.xes.yaml\n#{exname} to-xes-xml ~/log/logs/456.xes.yaml"))
+  opt.on("")
+  opt.on(wrap("sort [LOG]         sort a cpee xes-yaml file by time:timestamp. Works for local and remote logs. When called without [LOG], all log files in the current directory are sorted. Examples:\n#{exname} sort https://cpee.org/log/123.xes.yaml\n#{exname} sort ~/log/logs/456.xes.yaml"))
   opt.parse!
 }
 
@@ -461,6 +468,44 @@ elsif command == 'to-xes-xml'
     File.write(fname, TEMPLATE_XES_XML_END, mode: 'a')
     puts "#{count}/#{total.to_i} 100% (took #{format_secs(duration)})                                         \n"
   end
+elsif command == 'sort'
+  path = if path
+    [path]
+  else
+    Dir.glob('*.xes.yaml')
+  end
+  path.each do |f|
+    index = []
+    write_list = []
+    io,unlink = ropen(f)
+    while(io.eof?().!())
+      start = io.pos()
+      docs = io.readline("---\n",chomp: true)
+      doc = YAML::load(docs, permitted_classes: [Time])
+      if(doc.nil?().!()) then
+        ts = doc.dig('event','time:timestamp')
+        if(ts.nil?().!())
+          index.push({ :ts => ts, :s => start.to_i(), :l => docs.length().to_i() })
+        else
+          if(index.empty?())
+            write_list.push({ :s => start.to_i(), :l => docs.length().to_i() })
+          else
+            index.last()[:l] = index.last()[:l]+4+docs.length().to_i()
+          end
+        end
+      end
+    end
+    write_list.concat(index.sort() { |a,b| Time.parse(a[:ts]) <=> Time.parse(b[:ts]) })
+    output_file = File.open("#{File.basename(f,'.xes.yaml')}.sorted.xes.yaml", 'w')
+    write_list.each() { |el|
+      output_file.write("---\n")
+      io.seek(el[:s],IO::SEEK_SET)
+      output_file.write(io.read(el[:l]))
+    }
+    output_file.close()
+    io.close()
+    io.unlink() if unlink
+  end
 else
   puts ARGV.options
 end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
+- Matthias Ehrendorfer
+- Dominik Voigt
 bindir: tools
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z