pampa 2.0.14 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0137672f5c0b7c0cd2be75ddf221d84d65d824c8ba4bdf87b5cfd369bf9eef14
-  data.tar.gz: 7d8bb53cfd11c3d37b69b8408c544f1718fc0178f130f5f16785771e84af9ac9
+  metadata.gz: a8627e0b3e3f9d923c9dc750fde056078bfd202a74e3abd36eecfa27566c93f3
+  data.tar.gz: 27990d2b64539c229974280e5d80b630b7e6dfb05b4b6533ef8976031e791a7d
 SHA512:
-  metadata.gz: '00540329934fd5d5d22cae40967fee37ba4eba39a4383d324999da4902ea0a8e83c489a320820102ec3c8175a37fdace4a2147b0be490ec22e6c8380ab29f1a2'
-  data.tar.gz: 4efb7d405e0aa5d6a7c6f8b613b83fe14511d2f15a14f9338c48da4676204631a0c99fc34491474571c164779ad730e5820b397f2dc93a3abb3ff5bee6ec1851
+  metadata.gz: 71fb9a3ab3965c5aa591412c358ff6074b12d9e7ff6b8409d941ac28e42ba2ccb85288f1987a20758fd81c795d22323c597c2f15be040d5e1b628fed008aaecb
+  data.tar.gz: e33cfc7bca76c0a3031c4bfdc96417cfba6fadbcf7593b499a9eb2b5cefd996371b05548f159149ff2d204ae8035c524ac77c2dadbb081bde93693f0e64da1d9

data/lib/pampa.rb

@@ -358,7 +358,7 @@ module BlackStack
                     l.done
                     # kill all ruby processes except this one
                     l.logs("Killing all Ruby processes except this one... ")
-                    node.exec("ps ax | grep ruby | grep -v grep | grep -v #{Process.pid} | cut -b3-7 | xargs -t kill;", false);
+                    node.kill_workers()
                     l.done
                     # rename any existing folder ~/code/pampa to ~/code/pampa.<current timestamp>.
                     l.logs("Renaming old folder... ")
@@ -383,8 +383,23 @@ module BlackStack
                         # run the worker
                         # add these parameters for debug: debug=yes pampa=~/code/pampa/lib/pampa.rb
                         l.logs "Running worker #{worker.id}... "
-                        s = "nohup ruby #{BlackStack::Pampa.worker_filename} id=#{worker.id} config=#{BlackStack::Pampa.working_directory}/#{BlackStack::Pampa.config_filename} >/dev/null 2>&1 &" 
-                        node.exec("#{s}", false);
+
+                        # write bash command to initialize bash file
+                        s = "echo \"
+                          export RUBYLIB=$HOME/code/mysaas;
+                          source $HOME/.profile; 
+                          source /usr/local/rvm/scripts/rvm;
+                          cd ~/code/mysaas; rvm install 3.1.2;
+                          rvm --default use 3.1.2;
+                          cd #{BlackStack::Pampa.working_directory}; 
+                          nohup ruby #{worker_filename} id=#{worker.id} config=#{self.config_filename} >/dev/null 2>&1 &
+                        \" > #{BlackStack::Pampa.working_directory}/#{worker.id}.sh"
+                        node.exec(s, false);
+
+                        #s = "nohup bash #{BlackStack::Pampa.working_directory}/worker.sh >/dev/null 2>&1 &"
+                        s = "bash #{BlackStack::Pampa.working_directory}/#{worker.id}.sh"
+                        node.exec(s, false);
+
                         l.done
                     }
                     # disconnect the node
@@ -418,7 +433,7 @@ module BlackStack
                   l.done
                   # kill all ruby processes except this one
                   l.logs("Killing all Ruby processes except this one... ")
-                  node.exec("ps ax | grep ruby | grep -v grep | grep -v #{Process.pid} | cut -b3-7 | xargs -t kill;", true);
+                  node.kill_workers()
                   l.done
                   # run the number of workers specified in the configuration of the Pampa module.
                   node.workers.each { |worker|
@@ -429,10 +444,18 @@ module BlackStack
                       l.logs "Running worker #{worker.id}... "
 
                       # write bash command to initialize bash file
-                      s = "echo \"source $HOME/.profile; cd #{BlackStack::Pampa.working_directory}; nohup ruby #{worker_filename} id=#{worker.id} config=#{self.config_filename} >/dev/null 2>&1 &\" > #{BlackStack::Pampa.working_directory}/worker.sh"
+                      s = "echo \"
+                        export RUBYLIB=$HOME/code/mysaas;
+                        source $HOME/.profile; 
+                        source /usr/local/rvm/scripts/rvm;
+                        cd ~/code/mysaas; rvm install 3.1.2;
+                        rvm --default use 3.1.2;
+                        cd #{BlackStack::Pampa.working_directory}; 
+                        nohup ruby #{worker_filename} id=#{worker.id} config=#{self.config_filename} >/dev/null 2>&1 &
+                      \" > #{BlackStack::Pampa.working_directory}/#{worker.id}.sh"
+#binding.pry
                       node.exec(s, false);
-                    
-                      s = "nohup bash #{BlackStack::Pampa.working_directory}/worker.sh >/dev/null 2>&1 &"
+                      s = "nohup bash #{BlackStack::Pampa.working_directory}/#{worker.id}.sh >/dev/null 2>&1 &"
                       node.exec(s, false);
 
                       l.done
@@ -469,7 +492,7 @@ module BlackStack
                     l.done
                     # kill all ruby processes except this one
                     l.logs("Killing all Ruby processes except this one... ")
-                    node.exec("ps ax | grep ruby | grep -v grep | grep -v #{Process.pid} | cut -b3-7 | xargs -t kill;", false);
+                    node.kill_workers()
                     l.done
                     # disconnect the node
                     l.logs("Disconnecting... ")
@@ -490,7 +513,8 @@ module BlackStack
             # connect the node
             n.connect()
             # get the time of the last time the worker wrote the log file
-            s = n.exec("cat #{BlackStack::Pampa.working_directory}/worker.#{worker_id}.log | tail -n 1 | cut -b1-19", false).to_s.strip
+            code = "cat #{BlackStack::Pampa.working_directory}/worker.#{worker_id}.log | tail -n 1 | cut -b1-19"
+            s = n.exec(code, false).to_s.strip
             # run bash command to get the difference in minutes beteen now and the last time the worker wrote the log file
             s = n.exec("echo \"$(($(date +%s) - $(date -d '#{s}' +%s))) / 60\" | bc", false).to_s.strip
             # disconnect the node
@@ -592,6 +616,15 @@ module BlackStack
                 end
                 ret
             end
+            # kill all workers
+            def kill_workers()
+                self.workers.each do |worker|
+                    self.kill_worker(worker.id)
+                end
+            end
+            def kill_worker(worker_id)
+                self.exec("kill -9 $(ps -ef | grep \"ruby worker.rb id=#{worker_id}\" | grep -v grep | awk '{print $2}')", false)
+            end
         end # class Node
 
         # stub job class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pampa
 version: !ruby/object:Gem::Version
-  version: 2.0.14
+  version: 2.0.15
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-11 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel