cpee-model-management 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2407951bdeabf8fad81810a6c56b3ce1f8a28d17e583d6c32207424cdc11334a
-  data.tar.gz: 9286ff4e9aa86127c7ce19ab0bd0da71b596b6ef035a99b48bea5bc4e85f1383
+  metadata.gz: 6fc783f8350eac7d65fbda35f275d4ea319878f2265e5d3e02eaf234eb0d4fd1
+  data.tar.gz: c16ceedc6068a9d0114ddc5456625f55a8a7072770d2e3af28479198a988282c
 SHA512:
-  metadata.gz: 27df5a985c2441e656cfaefcb72377bbf720d04fe21c49fb9866c2b1b42d314af515f3dba981e8afb4fb616d2a9cdc897af8fd048d7547f57cfac594cac0ab1c
-  data.tar.gz: 076150342b2320ac0103a245f2162e7c03450970c9d078cd1446b1f400996dea35f4350a0aacbeed696344d3d996337531e7a25daa42ab9e755b3c8687ef05cb
+  metadata.gz: 12fe97b8aa17301c3863fb983d0527efae7aacecfb313d5963a0a0d19aa30d73c00ff2b85275a1a0d50a48010d4185df3ff7fd9c4eae15c467ee230b8cc35154
+  data.tar.gz: 3a657a24d96ebde89e77378f35aed645e3548148c5c33ba28b064362030c5f9b35394e7704cf64b818d5d85b083ab0da84790575f1e8e601d25ae2e6ed0967d2

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.1.0"
+  s.version          = "1.1.1"
   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

@@ -678,6 +678,7 @@ module CPEE
               multi.del(File.join(prefix,'state'))
               multi.del(File.join(prefix,'cpu'))
               multi.del(File.join(prefix,'mem'))
+              multi.del(File.join(prefix,'time'))
               children.each do |child|
                 if parent
                   multi.set(File.join(engine,child,'parent'),parent)
@@ -706,6 +707,7 @@ 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)
             end
           elsif %w{stopping}.include?(content['state'])
             redis.set(File.join(prefix,'state'),content['state'])
@@ -716,13 +718,16 @@ 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)
             end
           elsif %w{running}.include?(content['state'])
             oldstate = redis.get(File.join(prefix,'state'))
             redis.multi do |multi|
               multi.decr(File.join(engine,oldstate)) rescue nil
               multi.incr(File.join(engine,'running'))
+              multi.set(File.join(prefix,'name'),attr['info'])
               multi.set(File.join(prefix,'state'),content['state'])
+              multi.set(File.join(prefix,'time'),Time.now.to_i)
             end
           end
 
@@ -756,6 +761,7 @@ module CPEE
           end
         elsif topic == 'status'  && event_name == 'resource_utilization'
           redis.multi do |multi|
+            multi.set(File.join(prefix,'name'),attr['info'])
             multi.set(File.join(prefix,'cpu'),content['utime'] + content['stime'])
             multi.set(File.join(prefix,'mem'),content['mib'])
           end

data/tools/cpee-moma

@@ -8,6 +8,7 @@ require 'zip'
 require 'typhoeus'
 require 'json'
 require 'securerandom'
+require 'redis'
 
 def wrap(s, width=78, indent=18)
 	lines = []
@@ -62,10 +63,12 @@ ARGV.options { |opt|
   opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
   opt.on(wrap("[convert]         converts all testsets in the current directory to design terminology."))
+	opt.on("")
+  opt.on(wrap("[consistent]      makes the instances db consistent. can only be run in server dir."))
   opt.parse!
 }
 if (ARGV.length == 0) ||
-   (ARGV.length == 1  && !(%w(convert).include?(ARGV[0]))) ||
+   (ARGV.length == 1  && !(%w(convert consistent).include?(ARGV[0]))) ||
    (ARGV.length == 2  && !(%w(cpui new).include?(ARGV[0]))) ||
    (ARGV.length >  2)
   puts ARGV.options
@@ -182,6 +185,62 @@ elsif command == 'convert'
     File.unlink(f + '.creator') rescue nil
     File.unlink(f + '.author') rescue nil
   end
+elsif command == 'consistent'
+  redis = Redis.new(path: 'redis.sock', db: 0)
+  redis.keys('*/instances').each do |instances|
+    engine = File.dirname(instances)
+    s_ready = s_running = s_stopped = 0
+    redis.lrange(instances,0,-1).each do |i|
+      prefix = File.join(engine,i.to_s)
+      url = redis.get(File.join(prefix,'instance-url'))
+      res = Typhoeus.get(url, :followlocation => true)
+      if res.success?
+        oldstate = redis.get(File.join(prefix,'state'))
+        case oldstate
+          when 'ready'
+            s_ready += 1
+          when 'running'
+            s_running += 1
+          when 'stopped'
+            s_stopped += 1
+        end
+      else
+        parent = redis.get(File.join(prefix,'parent'))
+        oldstate = redis.get(File.join(prefix,'state'))
+        children = redis.lrange(File.join(prefix,'children'),0,-1)
+        redis.multi do |multi|
+          multi.decr(File.join(engine,oldstate)) rescue nil
+          multi.incr(File.join(engine,'total_abandoned'))
+          multi.lrem(File.join(engine,'instances'),0,i.to_s)
+          multi.del(File.join(prefix,'instance-url'))
+          multi.del(File.join(prefix,'author'))
+          multi.del(File.join(prefix,'path'))
+          multi.del(File.join(prefix,'name'))
+          multi.del(File.join(prefix,'state'))
+          multi.del(File.join(prefix,'cpu'))
+          multi.del(File.join(prefix,'mem'))
+          multi.del(File.join(prefix,'time'))
+          children.each do |child|
+            if parent
+              multi.set(File.join(engine,child,'parent'),parent)
+            else
+              multi.del(File.join(engine,child,'parent'))
+            end
+          end
+          multi.del(File.join(prefix,'children'))
+          multi.del(File.join(prefix,'parent'))
+          if parent
+            multi.lrem(File.join(engine,parent,'children'),0,i.to_s)
+          end
+        end
+      end
+    end
+    redis.multi do |multi|
+      multi.set(File.join(engine,'ready'),s_ready.to_i)
+      multi.set(File.join(engine,'running'),s_running.to_i)
+      multi.set(File.join(engine,'stopped'),s_stopped.to_i)
+    end
+  end
 elsif command == 'new'
   if !File.exists?(p1)
     FileUtils.mkdir(File.join(p1)) rescue nil

data/ui/index.html

@@ -179,9 +179,8 @@
               <td class="num">(<span></span>)</td>
               <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="cpu"></td>
-              <td>/</td>
               <td class="mem"></em></td>
+              <td class="active"></em></td>
             </tr>
             <tr class="sub">
               <td colspan="6"><table></table></td>

data/ui/instances.html

@@ -56,6 +56,11 @@
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
     <script type="text/javascript" src="js/stats.js"></script>
+    <style>
+      [is="x-ui-"] {
+        overflow: scroll;
+      }
+    </style>
   </head>
   <body is="x-ui-">
     <p>

data/ui/instances_view.html

@@ -0,0 +1,89 @@
+<!--
+  This file is part of CPEE-MODEL-MANAGEMENT.
+
+  CPEE-MODEL-MANAGEMENT is free software: you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  CPEE-MODEL-MANAGEMENT is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+  more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE-MODEL-MANAGEMENT (file LICENSE in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>Instances</title>
+
+    <!-- libs, do not modify. When local than load local libs. -->
+    <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
+    <script type="text/javascript" src="/js_libs/vkbeautify.js"></script>
+    <script type="text/javascript" src="/js_libs/util.js"></script>
+    <script type="text/javascript" src="/js_libs/printf.js"></script>
+    <script type="text/javascript" src="/js_libs/strftime.min.js"></script>
+    <script type="text/javascript" src="/js_libs/parsequery.js"></script>
+    <script type="text/javascript" src="/js_libs/underscore.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
+    <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
+    <script type="text/javascript" src="/js_libs/plotly.min.js"></script>
+
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
+
+    <script type="text/javascript" src="/js_libs/relaxngui.js"></script>
+
+    <script type="text/javascript" src="/js_libs/uidash.js"></script>
+    <script type="text/javascript" src="/js_libs/custommenu.js"></script>
+
+    <link   rel="stylesheet"      href="/js_libs/custommenu.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/js_libs/uidash.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/global_ui/ui.css" type="text/css"/>
+
+    <link   rel="stylesheet"      href="/js_libs/relaxngui.css" type="text/css"/>
+
+    <!-- custom stuff, play arround  -->
+    <link   rel="stylesheet"      href="css/design.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
+    <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
+    <script type="text/javascript" src="js/stats.js"></script>
+    <style>
+      [is="x-ui-"] {
+        overflow: scroll;
+      }
+    </style>
+  </head>
+  <body is="x-ui-">
+    <p>
+      Show ready, running and stopped instances.
+    </p>
+    <template id="stats_instances">
+      <h1 class="stats_title">Engine: </h1>
+      <table class='instances'></table>
+    </template>
+    <template id="stats_instance">
+      <tr class="text">
+        <td class="name"><a href='' target='_blank'><em>no name</em></a></td>
+        <td class="num">(<span></span>)</td>
+        <td class="state"><span class='value'></span></td>
+        <td class="author"><em>unknown</em></td>
+        <td class="cpu"></td>
+        <td>/</td>
+        <td class="mem"></em></td>
+      </tr>
+      <tr class="sub">
+        <td colspan="6"><table></table></td>
+      </tr>
+    </template>
+    <div id='instances'></div>
+  </body>
+</html>

data/ui/js/stats.js

@@ -87,6 +87,7 @@ function instance_change(d) {
 function instance_upd(uuid,name,state,author,cpu,mem,parent) {
   if (name != "") {
     $('[data-id=' + uuid + '] > .name a').text(name)
+    $('[data-id=' + uuid + '] > .name a').attr('title',name)
   }
   $('[data-id=' + uuid + '] > .state span.value').text(state)
   $('[data-id=' + uuid + '] > .state').attr('data-state',state)
@@ -110,6 +111,7 @@ function instance_add(iname,uuid,url,name,state,author,cpu,mem,parent) {
   $('.num span',inode).text(url.split(/[\\/]/).pop())
   if (name != "") {
     $('.name a',inode).text(name)
+    $('.name a',inode).attr('title',name)
   }
   $('.state span.value',inode).text(state)
   $('.state',inode).attr('data-state',state)
@@ -137,6 +139,8 @@ function instances_striping(iname) {
   })
 }
 
+function timer(ms) { return new Promise(res => setTimeout(res, ms)); }
+
 function instances_init(ename) {
   const iname = ename.replace(/[^a-z0-9A-Z]/g,'-').replace(/-$/,'')
   let inode = document.importNode($("#stats_instances")[0].content,true);
@@ -148,9 +152,9 @@ function instances_init(ename) {
     url: 'server/dash/instances',
     data: { engine: ename },
     success: (result) => {
-      $('instance',result).each((i,ele)=>{
+      $('instance',result).each(async (i,ele)=>{
         const e = $(ele);
-        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'))
+        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)
       })
     }
   })

data/ui/resources.html

@@ -55,6 +55,11 @@
     <link   rel="stylesheet"      href="css/stats.css" type="text/css"/>
     <link   rel="stylesheet"      href="css/stats_standalone.css" type="text/css"/>
     <script type="text/javascript" src="js/stats.js"></script>
+    <style>
+      [is="x-ui-"] {
+        overflow: scroll;
+      }
+    </style>
   </head>
   <body is="x-ui-">
     <p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -86,6 +86,7 @@ files:
 - ui/css/stats_standalone.css
 - ui/index.html
 - ui/instances.html
+- ui/instances_view.html
 - ui/js/design.js
 - ui/js/stats.js
 - ui/resources.html