pampa 2.0.8 → 2.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/pampa.rb +16 -3
  3. metadata +21 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bb720f9cd75fa6fc476e465d48e1222a1066e07ab361d7eacc69d67c3c130f83
4
- data.tar.gz: afa28eaccc192fe352b7356224e69cff0266f3c1eeae5fef28f1921a7963ca07
3
+ metadata.gz: 12b10c740765e17db6cac653a32a366138ecbe993d9eff0cced1cef9a0a12bbd
4
+ data.tar.gz: 38230377115a54b5e429f31f82677283e2f5db6e0dbc46f723a8c5ceccf2aac6
5
5
  SHA512:
6
- metadata.gz: c42bed41e80885cf36078211abe5304f9b9dbffac43defadfad55fe9fe5f30a02b53b38dbc194d10e3528710443e75d0ca09d45335abecfacc7e51e3b16369fe
7
- data.tar.gz: 7d720e7f7392867208719906f04d286f99e16c3df1ce3fc2b57e4b6e9281684c3ab81b3ff420adcab9306e0b102077d88c8559f94c758c85f25c3b149cd112d2
6
+ metadata.gz: 7e7b63204f3c0015edfa356a1449df5b1b815f5433935301320c8737f54c6e33de179895f7eb4103b9ea3a7102c2daab2419fb253db5ab3a7e7fc7d5c9756da9
7
+ data.tar.gz: c0d8589ed8da6ede820ff70c718b28f8c7162f15eceaea279f0ddeb97defbeb66e5c44d06c52ed6fc51e830f284f3c7c4b6a45f6719f83a8e7450ea9452adcf5
data/lib/pampa.rb CHANGED
@@ -1,12 +1,14 @@
1
1
  require 'sequel'
2
2
  require 'blackstack-core'
3
3
  require 'blackstack-nodes'
4
- #require 'blackstack-deployer'
4
+ require 'blackstack-deployer'
5
5
  require 'simple_command_line_parser'
6
6
  require 'simple_cloud_logging'
7
7
 
8
8
  module BlackStack
9
9
  module Pampa
10
+ # activate this flag if you want to add pampa nodes to blackstack-deployer.
11
+ @@integrate_with_blackstack_deployer = false
10
12
  # arrays of workers, nodes, and jobs.
11
13
  @@nodes = []
12
14
  @@jobs = []
@@ -31,6 +33,15 @@ module BlackStack
31
33
  @@logger = l
32
34
  end
33
35
 
36
+ # @@integrate_with_blackstack_deployer
37
+ def self.integrate_with_blackstack_deployer()
38
+ @@integrate_with_blackstack_deployer
39
+ end
40
+
41
+ def self.set_integrate_with_blackstack_deployer(b)
42
+ @@integrate_with_blackstack_deployer = b
43
+ end
44
+
34
45
  # return the log filename.
35
46
  def self.log_filename()
36
47
  @@log_filename
@@ -49,6 +60,8 @@ module BlackStack
49
60
  # add a node to the cluster.
50
61
  def self.add_node(h)
51
62
  @@nodes << BlackStack::Pampa::Node.new(h)
63
+ # add to deployer
64
+ BlackStack::Deployer.add_node(h) if @@integrate_with_blackstack_deployer
52
65
  end # def self.add_node(h)
53
66
 
54
67
  # add an array of nodes to the cluster.
@@ -355,7 +368,7 @@ module BlackStack
355
368
  # run the number of workers specified in the configuration of the Pampa module.
356
369
  # return an array with the IDs of the workers.
357
370
  #
358
- def self.start()
371
+ def self.start(config_filename='~/pampa/config.rb', worker_filename='~/pampa/worker.rb')
359
372
  # validate: the connection string is not nil
360
373
  raise "The connection string is nil" if @@connection_string.nil?
361
374
  # validate: the connection string is not empty
@@ -380,7 +393,7 @@ module BlackStack
380
393
  # run the worker
381
394
  # add these parameters for debug: debug=yes pampa=~/code/pampa/lib/pampa.rb
382
395
  l.logs "Running worker #{worker.id}... "
383
- s = "nohup ruby worker.rb id=#{worker.id} config=~/pampa/config.rb >/dev/null 2>&1 &"
396
+ s = "nohup ruby #{worker_filename} id=#{worker.id} config=#{config_filename} >/dev/null 2>&1 &"
384
397
  node.exec(s, false)
385
398
  l.done
386
399
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pampa
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.8
4
+ version: 2.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Leandro Daniel Sardi
@@ -70,6 +70,26 @@ dependencies:
70
70
  - - ">="
71
71
  - !ruby/object:Gem::Version
72
72
  version: 1.2.11
73
+ - !ruby/object:Gem::Dependency
74
+ name: blackstack-deployer
75
+ requirement: !ruby/object:Gem::Requirement
76
+ requirements:
77
+ - - "~>"
78
+ - !ruby/object:Gem::Version
79
+ version: 1.2.24
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: 1.2.24
83
+ type: :runtime
84
+ prerelease: false
85
+ version_requirements: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - "~>"
88
+ - !ruby/object:Gem::Version
89
+ version: 1.2.24
90
+ - - ">="
91
+ - !ruby/object:Gem::Version
92
+ version: 1.2.24
73
93
  - !ruby/object:Gem::Dependency
74
94
  name: simple_command_line_parser
75
95
  requirement: !ruby/object:Gem::Requirement