cpee-model-management 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1410ff8045350ca1f2bd3c5484c43647989b4f6cfe48279ad07db1d437efa1f9
-  data.tar.gz: b5763ad9ddecacc90e9fb82a41dc7d203690a11366b5e6af403b7ca632b16ae5
+  metadata.gz: cbd52e9e07809d503c71fb7b716fe287949a4aaf8030518110ae05f98295b8c1
+  data.tar.gz: 40289a6d6147b5358b088fa3885c8df2e2c50bb61bfbd54122ec8681489f99a1
 SHA512:
-  metadata.gz: 7f8f434c1173d75de6bae7ab39b0fcfdc2e6477476dd903f04243760c22838702526e8a67c837f22af57cfbb9e5e7e3c91cb5dc3bae8d93068ed07756a32a013
-  data.tar.gz: ea38c5d580c580f37fda8b7a08efcc34e3116958fec02f3f6f88443daee63012d9f40841d8ee059f88b0c2226c264399316e62576ad72a4b269f65d87f733fe8
+  metadata.gz: 0b7b76036df9e4ec5ebae8283d2d84d7eda794d1c195db080425d9cecba4650b7eabe52c785864c25af30bd29ad1a05bec63c66887e70b56e2f1b3ea5c783bea
+  data.tar.gz: a231affcade7800f587ea6bdfe2bdf3f1bce2ea8774d6e91e1c5bcc9bd1ff3da3b1ded34c9938170d89c165ced44a2203cd4723e7ec438c88c32076fa91f4a6d

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.2.2"
+  s.version          = "1.2.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."

data/lib/cpee-model-management/implementation.rb

@@ -724,10 +724,13 @@ module CPEE
               multi.set(File.join(prefix,'name'),attr['info'])
               multi.set(File.join(prefix,'cpu'),0)
               multi.set(File.join(prefix,'mem'),0)
-              multi.set(File.join(prefix,'time'),0)
+              multi.set(File.join(prefix,'time'),Time.now.to_i)
             end
           elsif %w{stopping}.include?(content['state'])
-            redis.set(File.join(prefix,'state'),content['state'])
+            redis.multi do |multi|
+              multi.set(File.join(prefix,'state'),content['state'])
+              multi.set(File.join(prefix,'time'),Time.now.to_i)
+            end
           elsif %w{stopped}.include?(content['state'])
             redis.multi do |multi|
               multi.decr(File.join(engine,'running'))
@@ -735,7 +738,7 @@ module CPEE
               multi.set(File.join(prefix,'state'),content['state'])
               multi.set(File.join(prefix,'cpu'),0)
               multi.set(File.join(prefix,'mem'),0)
-              multi.set(File.join(prefix,'time'),0)
+              multi.set(File.join(prefix,'time'),Time.now.to_i)
             end
           elsif %w{running}.include?(content['state'])
             oldstate = redis.get(File.join(prefix,'state'))
@@ -748,16 +751,17 @@ module CPEE
             end
           end
 
-          url, author, path, name, state, parent = redis.mget(
+          url, author, path, name, state, time, parent = redis.mget(
             File.join(prefix,'instance-url'),
             File.join(prefix,'author'),
             File.join(prefix,'path'),
             File.join(prefix,'name'),
             File.join(prefix,'state'),
+            File.join(prefix,'time'),
             File.join(prefix,'parent')
           )
           receivers.each do |conn|
-            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :url => url, :author => author, :path => path.to_s, :name => name, :state => content['state'], :parent => parent.to_s)
+            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :url => url, :author => author, :path => path.to_s, :name => name, :state => content['state'], :time => time, :parent => parent.to_s)
           end
         elsif topic == 'task'  && event_name == 'instantiation'
           redis.multi do |multi|
@@ -765,16 +769,17 @@ module CPEE
             multi.set(File.join(engine,content['received']['CPEE-INSTANCE-UUID'],'parent'),notification['instance-uuid'])
           end
           prefix = File.join(engine,content['received']['CPEE-INSTANCE-UUID'].to_s)
-          url, author, path, name, state, parent = redis.mget(
+          url, author, path, name, state, time, parent = redis.mget(
             File.join(prefix,'instance-url'),
             File.join(prefix,'author'),
             File.join(prefix,'path'),
             File.join(prefix,'name'),
             File.join(prefix,'state'),
+            File.join(prefix,'time'),
             File.join(prefix,'parent')
           )
           receivers.each do |conn|
-            conn.send JSON::generate(:topic => 'state', :event => 'change', :engine => engine, :uuid => content['received']['CPEE-INSTANCE-UUID'], :url => url, :author => author, :path => path.to_s, :name => name, :state => state, :parent => parent.to_s)
+            conn.send JSON::generate(:topic => 'state', :event => 'change', :engine => engine, :uuid => content['received']['CPEE-INSTANCE-UUID'], :url => url, :author => author, :path => path.to_s, :name => name, :state => state, :time => time, :parent => parent.to_s)
           end
         elsif topic == 'status'  && event_name == 'resource_utilization'
           redis.multi do |multi|
@@ -821,7 +826,7 @@ module CPEE
         doc = XML::Smart.string('<instances/>')
         redis.lrange(File.join(engine,'instances'),0,-1).each do |i|
           prefix = File.join(engine,i.to_s)
-          url, author, path, name, state, cpu, mem, parent = redis.mget(
+          url, author, path, name, state, cpu, mem, parent,time = redis.mget(
             File.join(prefix,'instance-url'),
             File.join(prefix,'author'),
             File.join(prefix,'path'),
@@ -829,9 +834,10 @@ module CPEE
             File.join(prefix,'state'),
             File.join(prefix,'cpu'),
             File.join(prefix,'mem'),
-            File.join(prefix,'parent')
+            File.join(prefix,'parent'),
+            File.join(prefix,'time')
           )
-          doc.root.add('instance', :uuid => i, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent)
+          doc.root.add('instance', :uuid => i, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent, :time => time)
         end
         Riddl::Parameter::Complex.new('tree','text/xml',doc.to_s)
       end
@@ -842,7 +848,7 @@ module CPEE
         engine = @p[0].value
         uuid = @r[-1]
         prefix = File.join(engine,uuid.to_s)
-        url, author, path, name, state, cpu, mem, parent = redis.mget(
+        url, author, path, name, state, cpu, mem, parent, time = redis.mget(
           File.join(prefix,'instance-url'),
           File.join(prefix,'author'),
           File.join(prefix,'path'),
@@ -850,9 +856,11 @@ module CPEE
           File.join(prefix,'state'),
           File.join(prefix,'cpu'),
           File.join(prefix,'mem'),
-          File.join(prefix,'parent')
+          File.join(prefix,'parent'),
+          File.join(prefix,'time')
+
         )
-        Riddl::Parameter::Complex.new('instance','application/json',JSON.generate(:uuid => uuid, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent))
+        Riddl::Parameter::Complex.new('instance','application/json',JSON.generate(:uuid => uuid, :url => url, :author => author, :path => path, :name => name, :state => state, :cpu => cpu, :mem => mem, :parent => parent, :time => time))
       end
     end #}}}
 

data/ui/index.html

@@ -167,7 +167,7 @@
               <td class="state"><span class='value'></span> <span class='abandon'>[<a href='#' title='abandon'>a</a>]</span></td>
               <td class="author"><em>unknown</em></td>
               <td class="mem"></em></td>
-              <td class="active"></em></td>
+              <td class="time"></em></td>
             </tr>
             <tr class="sub">
               <td colspan="6"><table></table></td>

data/ui/js/stats.js

@@ -61,12 +61,12 @@ function instance_change(d) {
     if ($('[data-id=' + d.uuid + ']').length > 0) {
       if ($('[data-id=' + d.uuid + ']').attr('data-parent') != parent) {
         $('[data-id=' + d.uuid + ']').remove()
-        instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.parent)
+        instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.time,d.parent)
       } else {
-        instance_upd(d.uuid,d.name,d.state,d.author,0,0,d.parent)
+        instance_upd(d.uuid,d.name,d.state,d.author,0,0,d.time,d.parent)
       }
     } else {
-      instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.parent)
+      instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.time,d.parent)
     }
   } else if (d.state == 'abandoned' || d.state == 'finished') {
     if ($('tr.sub[data-id=' + d.uuid + '] > td > table > tr').length > 0) {
@@ -77,14 +77,14 @@ function instance_change(d) {
   } else {
     if ($('tr.sub[data-id=' + d.uuid + ']').attr('data-parent') != d.parent) {
       $('[data-id=' + d.uuid + ']').remove()
-      instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.parent)
+      instance_add(iname,d.uuid,d.url,d.name,d.state,d.author,0,0,d.time,d.parent)
     } else {
-      instance_upd(d.uuid,d.name,d.state,d.author,0,0,d.parent)
+      instance_upd(d.uuid,d.name,d.state,d.author,0,0,d.time,d.parent)
     }
   }
 }
 
-function instance_upd(uuid,name,state,author,cpu,mem,parent) {
+function instance_upd(uuid,name,state,author,cpu,mem,time,parent) {
   if (name != "") {
     $('[data-id=' + uuid + '] > .name a').text(name)
     $('[data-id=' + uuid + '] > .name a').attr('title',name)
@@ -94,13 +94,14 @@ function instance_upd(uuid,name,state,author,cpu,mem,parent) {
   if (author != "") {
     $('[data-id=' + uuid + '] > .author').text(author)
   }
+  $('[data-id=' + uuid + '] > .time').text((new Date(time * 1000)).strftime("%H:%M:%S (%b-%d)"))
   instance_res(uuid,cpu,mem)
 }
 function instance_res(uuid,cpu,mem) {
   $('[data-id=' + uuid + '] > .cpu').text($.sprintf('%05.2f',cpu))
   $('[data-id=' + uuid + '] > .mem').text($.sprintf('%05.2f',mem))
 }
-function instance_add(iname,uuid,url,name,state,author,cpu,mem,parent) {
+function instance_add(iname,uuid,url,name,state,author,cpu,mem,time,parent) {
   let inode = document.importNode($("#stats_instance")[0].content,true);
   $('.sub',inode).attr('id',uuid)
   $('.sub',inode).attr('data-id',uuid)
@@ -120,6 +121,7 @@ function instance_add(iname,uuid,url,name,state,author,cpu,mem,parent) {
   }
   $('.cpu',inode).text($.sprintf('%05.2f',cpu))
   $('.mem',inode).text($.sprintf('%05.2f',mem))
+  $('.time',inode).text((new Date(time * 1000)).strftime("%H:%M:%S (%b-%d)"))
   if (parent == "") {
     $('#instances_' + iname).append(inode)
   } else {
@@ -154,7 +156,7 @@ function instances_init(ename) {
     success: (result) => {
       $('instance',result).each(async (i,ele)=>{
         const e = $(ele);
-        setTimeout(()=>{instance_add(iname,e.attr('uuid'),e.attr('url'),e.attr('name'),e.attr('state'),e.attr('author'),e.attr('cpu'),e.attr('mem'),e.attr('parent'))},0)
+        setTimeout(()=>{instance_add(iname,e.attr('uuid'),e.attr('url'),e.attr('name'),e.attr('state'),e.attr('author'),e.attr('cpu'),e.attr('mem'),e.attr('time'),e.attr('parent'))},0)
       })
     }
   })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2024-03-19 00:00:00.000000000 Z
+date: 2024-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: "(Lifecycle) manage your process models in a directory or git repo."