cpee-model-management 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f90d17cb996ce84af9f3f816732c153a3e10dfefb20aac6aaae26dd1290d464
-  data.tar.gz: bac5d187473b38d1794492d709ac177e6b9de336a9ba9d3972f8c5c6644b3021
+  metadata.gz: da8a1393a981789476307ef0e613545dc263312cc059d6660fb532ec89f01e4d
+  data.tar.gz: 810b7bd624babce546318e16ed0c1dda2a46332dcbb8968640db0fc0c6679e23
 SHA512:
-  metadata.gz: 7be6532682b79a04cfbc2d5d27c471a106f7b094d94d24c4ddbb6d2ebe999a2766cd2e243c8a5c7deabb0cfcf3a374d765fc569dee47c2ffba63678244dde0e6
-  data.tar.gz: d0ca2d3aa5323b3714c5c94a0574a2c17e1ce14e5d901d59e85300c34175d491273ceca9e8e4a80a06b3a92f32e3d17d92c37d42532b695695a0f26e137b88ab
+  metadata.gz: 15fbcfa24d65bae3f763963726664b74bdae9b5c4843f1121e21bd65dd78448a3325607a880483e04e046c76556ff66c7d956a857345992301c4ba1bd67943e9
+  data.tar.gz: f1836da53235376adeaef4186be11803b605a2e2f76f2bfaad71991be020bdc3663a627769f7ba7eca08d5c4246879c5430bc8beaabc93989e6ff62782eb59c7

data/cpee-model-management.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-model-management"
-  s.version          = "1.2.6"
+  s.version          = "1.2.7"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "(Lifecycle) manage your process models in a directory or git repo."
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 1.0'
+  s.add_runtime_dependency 'riddl', '~> 1.0', '>=1.0.12'
   s.add_runtime_dependency 'json', '~> 2.1'
   s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.114'
 end

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

@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+require_relative 'implementation'
+
+options = {
+  :host => 'localhost',
+  :port => 9317,
+  :secure => false
+}
+
+Riddl::Server.new(File.join(__dir__,'dashing.xml'), options) do |opts|
+  accessible_description true
+  cross_site_xhr true
+
+  ### set redis_cmd to nil if you want to do global
+  ### at least redis_path or redis_url and redis_db have to be set if you do global
+  opts[:redis_db]                   ||= 0
+  opts[:redis_url]                  ||= 'unix://redis.sock' # sadly we have to do this for now
+  opts[:redis_unixsocket]           ||= true
+  opts[:redis_cmd]                  ||= 'redis-server --port #redis_port# --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir         #redis_db_dir# --dbfilename                  #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --            daemonize yes --protected-mode no'
+  opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
+  opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
+
+  startup do
+    CPEE::redis_connect opts, 'Server Main'
+  end
+
+  interface 'events' do
+    run CPEE::ModelManagement::StatReceive, opts[:redis], opts[:stat_receivers] if post 'event'
+  end
+end.loop!

data/lib/cpee-model-management/{moma.xml → dashing.xml}

@@ -1,18 +1,12 @@
 <declaration xmlns="http://riddl.org/ns/declaration/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <interface name="implementation">
-    <xi:include href="implementation.xml"/>
-  </interface>
   <interface name="events">
     <xi:include href="http://www.riddl.org/ns/common-patterns/notifications-consumer/2.0/consumer.xml"/>
   </interface>
 
   <facade>
     <tile>
-      <layer name="implementation">
-        <apply-to>/</apply-to>
-      </layer>
       <layer name="events">
-        <apply-to>/dash/events</apply-to>
+        <apply-to>/</apply-to>
       </layer>
     </tile>
   </facade>

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

@@ -31,7 +31,7 @@ require 'digest/sha1'
 module CPEE
   module ModelManagement
 
-    SERVER = File.expand_path(File.join(__dir__,'moma.xml'))
+    SERVER = File.expand_path(File.join(__dir__,'implementation.xml'))
 
     def self::git_mv(models,old,new)
       cdir = Dir.pwd
@@ -299,7 +299,7 @@ module CPEE
         end
         File.write(fname + '.attrs',JSON::pretty_generate(attrs))
 
-        CPEE::ModelManagement::op author, 'mv', models, File.join('.', where, nname + '.xml'), File.join('.', where, name + '.xml')
+        CPEE::ModelManagement::op author, 'mv', models, File.join('.', where, File.basename(fnname)), File.join('.', where, name + '.xml')
         CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
         nil
       end
@@ -330,7 +330,7 @@ module CPEE
           XML::Smart::modify(f) do |doc|
             doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
             doc.find('/p:testset/p:attributes/p:design_dir').each do |ele|
-              ele.text = nname + '.dir'
+              ele.text = File.basename(fnname,'.dir')
             end
             attrs = doc.find('/p:testset/p:attributes/*').map do |e|
               [e.qname.name,e.text]
@@ -339,7 +339,7 @@ module CPEE
           File.write(f + '.attrs',JSON::pretty_generate(attrs))
         end
 
-        CPEE::ModelManagement::op author, 'mv', models, File.join(nname + '.dir'), File.join(name + '.dir')
+        CPEE::ModelManagement::op author, 'mv', models, File.basename(fnname), name + '.dir'
         CPEE::ModelManagement::notify conns, 'rename', models, fnname, fname
         nil
       end
@@ -667,7 +667,6 @@ module CPEE
     class StatReceive < Riddl::Implementation #{{{
       def response
         redis         = @a[0]
-        receivers     = @a[1]
         topic         = @p[1].value
         event_name    = @p[2].value
         notification  = JSON.parse(@p[3].value.read)
@@ -734,13 +733,16 @@ module CPEE
               end
             end
           elsif %w{stopped}.include?(content['state'])
-            redis.multi do |multi|
-              multi.decr(File.join(engine,'running'))
-              multi.incr(File.join(engine,'stopped'))
-              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'),Time.now.to_i)
+            oldstate = redis.get(File.join(prefix,'state'))
+            if oldstate && oldstate != 'stopped' # stopped can be repeated when reloading instance, any other state before is either fine or can not happen
+              redis.multi do |multi|
+                multi.decr(File.join(engine,'running'))
+                multi.incr(File.join(engine,'stopped'))
+                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'),Time.now.to_i)
+              end
             end
           elsif %w{running}.include?(content['state'])
             oldstate = redis.get(File.join(prefix,'state'))
@@ -762,9 +764,7 @@ module CPEE
             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'], :time => time, :parent => parent.to_s)
-          end
+          redis.publish 'forward', 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)
         elsif topic == 'task'  && event_name == 'instantiation'
           redis.multi do |multi|
             multi.rpush(File.join(engine,notification['instance-uuid'],'children'),content['received']['CPEE-INSTANCE-UUID'])
@@ -780,18 +780,14 @@ module CPEE
             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, :time => time, :parent => parent.to_s)
-          end
+          redis.publish 'forward', 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)
         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
-          receivers.each do |conn|
-            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :cpu => content['utime'] + content['stime'], :mem => content['mib'])
-          end
+          redis.publish 'forward', JSON::generate(:topic => topic, :event => event_name, :engine => engine, :uuid => notification['instance-uuid'], :cpu => content['utime'] + content['stime'], :mem => content['mib'])
         elsif topic == 'node'  && event_name == 'resource_utilization'
           redis.multi do |multi|
             multi.set(File.join(engine,'cpu_usage'),content['cpu_usage'])
@@ -799,9 +795,7 @@ module CPEE
             multi.set(File.join(engine,'mem_total'),content['mem_total'])
             multi.set(File.join(engine,'mem_available'),content['mem_available'])
           end
-          receivers.each do |conn|
-            conn.send JSON::generate(:topic => topic, :event => event_name, :engine => engine, :cpu_usage => content['cpu_usage'], :mem_free => content['mem_free'], :mem_total => content['mem_total'], :mem_available => content['mem_available'])
-          end
+          redis.publish 'forward', JSON::generate(:topic => topic, :event => event_name, :engine => engine, :cpu_usage => content['cpu_usage'], :mem_free => content['mem_free'], :mem_total => content['mem_total'], :mem_available => content['mem_available'])
         end
       end
     end #}}}
@@ -866,11 +860,36 @@ module CPEE
       end
     end #}}}
 
+    def self::service_handler(opts,cmd,out) #{{{
+      1.upto opts[:workers] do |i|
+        s = File.join(__dir__,'dashing.rb')
+        next if File.exist?(s + '.lock')
+        pid = (File.read(s + '.pid').to_i rescue nil)
+        if (pid.nil? || !(Process.kill(0, pid) rescue false))
+          params = "-p #{opts[:port].to_i + i} -o basepath=#{File.realpath(opts[:basepath])} #{cmd} 1>/dev/null 2>&1"
+          system "#{s} #{params} 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s)} (#{params}) #{out} ..."
+        end
+      end
+    end #}}}
+    def self::sse_stat_distributor(opts) #{{{
+      conn = opts[:redis_dyn].call "Server SSE"
+      conn.subscribe('forward') do |on|
+        on.message do |what, message|
+          opts[:stat_receivers].each do |conn|
+            conn.send message
+          end
+        end
+      end
+      conn.close
+    end #}}}
 
     def self::implementation(opts)
       opts[:management_receivers] = []
       opts[:stat_receivers] = []
 
+      opts[:workers] = 1
+
       ### set redis_cmd to nil if you want to do global
       ### at least redis_path or redis_url and redis_db have to be set if you do global
       opts[:redis_db]                   ||= 0
@@ -880,13 +899,15 @@ module CPEE
       opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
       opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
 
-      CPEE::redis_connect opts, 'Server Main'
-
       opts[:sse_keepalive_frequency]    ||= 10
 
+      CPEE::redis_connect opts, 'Server Main'
       Proc.new do
 
         parallel do
+          EM.defer do ### catch all sse connections
+            CPEE::ModelManagement::sse_stat_distributor(opts)
+          end
           EM.add_periodic_timer(opts[:sse_keepalive_frequency]) do
             opts[:management_receivers].each do |sse|
               sse.send_with_id('heartbeat', '42') unless sse&.closed?
@@ -897,11 +918,14 @@ module CPEE
           end
         end
 
-        interface 'events' do
-          run StatReceive, opts[:redis], opts[:stat_receivers] if post 'event'
+        startup do
+          CPEE::ModelManagement::service_handler(opts,'restart','started')
+        end
+        cleanup do
+          CPEE::ModelManagement::service_handler(opts,'stop','stopped')
         end
 
-        interface 'implementation' do
+        on resource do
           run GetList, :main, opts[:views], opts[:models] if get 'stage'
           run GetListFull, opts[:views], opts[:models] if get 'full'
           run GetStages, opts[:themes] if get 'stages'

data/server/moma

@@ -1,6 +1,11 @@
 #!/usr/bin/ruby
-require 'rubygems'
-require 'cpee-model-management/implementation'
+if File.exist?(File.join(__dir__,'..','lib','cpee-model-management','implementation.rb'))
+  require_relative File.join(__dir__,'..','lib','cpee-model-management','implementation')
+elsif File.exist?(File.join(Dir.home,'Projects','cpee-model-management','lib','cpee-model-management','implementation.rb'))
+  require_relative File.join(Dir.home, 'Projects','cpee-model-management','lib','cpee-model-management','implementation')
+else
+  require 'cpee-model-management/implementation'
+end
 
 options = {
   :host => 'localhost',

data/server/moma.conf

@@ -1,4 +1,5 @@
 :port: 9316
+:workers: 1
 :models: models
 :location: https://cpee.org/design/server/
 :instantiate: https://cpee.org/flow/start/

data/ui/js/stats.js

@@ -163,15 +163,15 @@ function instances_init(ename) {
 }
 
 function resource_paint(iname,data,count) {
-  count[iname]++
-  Plotly.extendTraces('resource_utilization_plot_' + iname, {y: [[data.cpu_usage], [(data.mem_total-data.mem_available)/data.mem_total * 100]]}, [0,1])
-  Plotly.relayout('resource_utilization_plot_' + iname, {
-    xaxis: {
-      range: [count[iname]-value_count,count[iname]],
-      showticklabels: false,
-      fixedrange: true
-    }
-  });
+  count[iname]++;
+  Plotly.extendTraces('resource_utilization_plot_' + iname, {y: [[data.cpu_usage], [(data.mem_total-data.mem_available)/data.mem_total * 100]]}, [0,1], value_count)
+  // Plotly.relayout('resource_utilization_plot_' + iname, {
+  //   xaxis: {
+  //     range: [count[iname]-value_count,count[iname]],
+  //     showticklabels: false,
+  //     fixedrange: true
+  //   }
+  // });
 }
 
 function stats_init() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-model-management
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -16,6 +16,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.12
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -71,14 +77,14 @@ files:
 - Rakefile
 - cpee-model-management.gemspec
 - lib/cpee-model-management/commit.rb
+- lib/cpee-model-management/dashing.rb
+- lib/cpee-model-management/dashing.xml
 - lib/cpee-model-management/implementation.rb
 - lib/cpee-model-management/implementation.xml
-- lib/cpee-model-management/moma.xml
 - lib/cpee-model-management/stages
 - server/model.xml
 - server/moma
 - server/moma.conf
-- server/redis.rdb
 - server/testset.xml
 - tools/cpee-moma
 - ui/css/moma.css