From ef6bdf3ca400fb8a602c5195a8edc6216c584325 Mon Sep 17 00:00:00 2001 From: Woon Jung Date: Fri, 9 Sep 2011 11:17:31 -0700 Subject: [PATCH] Change the cookbook to match the service config file changes. Recent change the dev_setup cookbook this change fixex the error. e.g: in mysql_node vcap_logging-0.1.0/lib/vcap/logging.rb:82:in `setup_from_config': undefined method `[]' for nil:NilClass (NoMethodError) Change-Id: I7706fc01e1a1743bb27de60cf8f89d182f4c18bf --- .../mongodb/templates/default/mongodb_gateway.yml.erb | 3 ++- .../cookbooks/mongodb/templates/default/mongodb_node.yml.erb | 3 ++- .../cookbooks/mysql/templates/default/mysql_gateway.yml.erb | 3 ++- .../cookbooks/mysql/templates/default/mysql_node.yml.erb | 3 ++- .../cookbooks/redis/templates/default/redis_gateway.yml.erb | 4 +++- .../cookbooks/redis/templates/default/redis_node.yml.erb | 3 ++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dev_setup/cookbooks/mongodb/templates/default/mongodb_gateway.yml.erb b/dev_setup/cookbooks/mongodb/templates/default/mongodb_gateway.yml.erb index 78021bc..0356a06 100644 --- a/dev_setup/cookbooks/mongodb/templates/default/mongodb_gateway.yml.erb +++ b/dev_setup/cookbooks/mongodb/templates/default/mongodb_gateway.yml.erb @@ -10,6 +10,7 @@ host: localhost index: 0 token: <%= node[:mongodb][:token] %> mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ -log_level: DEBUG pid: /var/vcap/sys/run/mongodb_service.pid +logging: + level: debug # allow_over_provisioning: false diff --git a/dev_setup/cookbooks/mongodb/templates/default/mongodb_node.yml.erb b/dev_setup/cookbooks/mongodb/templates/default/mongodb_node.yml.erb index 4ddf52f..7dc5077 100644 --- a/dev_setup/cookbooks/mongodb/templates/default/mongodb_node.yml.erb +++ b/dev_setup/cookbooks/mongodb/templates/default/mongodb_node.yml.erb @@ -3,7 +3,6 @@ local_db: sqlite3:/var/vcap/services/mongodb/mongodb_node.db mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ index: <%= node[:mongodb][:index] %> base_dir: /var/vcap/services/mongodb/instances -log_level: DEBUG pid: /var/vcap/sys/run/mongodb_node.pid available_memory: <%= node[:mongodb][:available_memory] %> max_memory: <%= node[:mongodb][:max_memory] %> @@ -14,3 +13,5 @@ port_range: first: 25001 last: 45000 migration_nfs: /mnt/migration +logging: + level: debug \ No newline at end of file diff --git a/dev_setup/cookbooks/mysql/templates/default/mysql_gateway.yml.erb b/dev_setup/cookbooks/mysql/templates/default/mysql_gateway.yml.erb index b647103..01a573b 100644 --- a/dev_setup/cookbooks/mysql/templates/default/mysql_gateway.yml.erb +++ b/dev_setup/cookbooks/mysql/templates/default/mysql_gateway.yml.erb @@ -9,7 +9,8 @@ service: host: localhost index: 0 token: <%= node[:mysql][:token] %> -log_level: DEBUG mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ pid: /var/vcap/sys/run/mysql_service.pid node_timeout: 2 +logging: + level: debug \ No newline at end of file diff --git a/dev_setup/cookbooks/mysql/templates/default/mysql_node.yml.erb b/dev_setup/cookbooks/mysql/templates/default/mysql_node.yml.erb index 4bd4922..72ee964 100644 --- a/dev_setup/cookbooks/mysql/templates/default/mysql_node.yml.erb +++ b/dev_setup/cookbooks/mysql/templates/default/mysql_node.yml.erb @@ -6,7 +6,6 @@ gzip_bin: gzip mysql_bin: mysql mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ index: <%= node[:mysql][:index] %> -log_level: DEBUG pid: /var/vcap/sys/run/mysql_node.pid available_storage: <%= node[:mysql][:available_storage] %> node_id: <%= "mysql_node_#{node[:mysql][:index]}" %> @@ -19,3 +18,5 @@ mysql: port: 3306 user: <%= node[:mysql][:server_root_user] %> pass: <%= node[:mysql][:server_root_password] %> +logging: + level: debug \ No newline at end of file diff --git a/dev_setup/cookbooks/redis/templates/default/redis_gateway.yml.erb b/dev_setup/cookbooks/redis/templates/default/redis_gateway.yml.erb index 88432b1..5030ef6 100644 --- a/dev_setup/cookbooks/redis/templates/default/redis_gateway.yml.erb +++ b/dev_setup/cookbooks/redis/templates/default/redis_gateway.yml.erb @@ -9,7 +9,9 @@ service: host: localhost index: 0 token: <%= node[:redis][:token] %> -log_level: DEBUG mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ pid: /var/vcap/sys/run/redis_service.pid +logging: + level: debug + # allow_over_provisioning: false diff --git a/dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb b/dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb index 0d288be..d268bc3 100644 --- a/dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb +++ b/dev_setup/cookbooks/redis/templates/default/redis_node.yml.erb @@ -3,7 +3,6 @@ local_db: sqlite3:/var/vcap/services/redis/redis_node.db mbus: nats://<%= node[:nats_server][:user] %>:<%= node[:nats_server][:password] %>@<%= node[:nats_server][:host] %>:<%= node[:nats_server][:port] %>/ index: <%= node[:redis][:index] %> base_dir: /var/vcap/services/redis/instances -log_level: DEBUG pid: /var/vcap/sys/run/redis_node.pid available_memory: <%= node[:redis][:available_memory] %> max_memory: <%= node[:redis][:max_memory] %> @@ -14,3 +13,5 @@ port_range: first: 5000 last: 25000 migration_nfs: /mnt/vcap +logging: + level: debug \ No newline at end of file