ocean-rails 7.0.4 → 7.0.5
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.
- checksums.yaml +4 -4
- data/config/initializers/_aws_config.rb +3 -3
- data/lib/ocean-rails.rb +2 -1
- data/lib/ocean/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0838aa1ceee275569e027e38341000b6ef6d052b
|
|
4
|
+
data.tar.gz: 7a215e48eb6d666f8611123ad34265118b78c9dc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 65e6de0a1effb6a88b960c991ddfcea0baa36fade0969edc36490a87acfd8df16515f870a3f38b452eb945dc7fe8439d4198da9d5751e0d18e2c8f1a3ab7c87c
|
|
7
|
+
data.tar.gz: cc138ac59d2dd8e2de3e03b43ee5fe09bbcba3a9ab82cb25d64d96d0a9d9d3e54cd968841f0a740a0946fd00783bf0432a21c3f1e154b72dc0aad4ac35cdce92
|
|
@@ -26,7 +26,7 @@ else
|
|
|
26
26
|
# Set the ENV variables
|
|
27
27
|
ENV['AWS_ACCESS_KEY_ID'] = cfg[:access_key_id] || cfg['access_key_id']
|
|
28
28
|
ENV['AWS_SECRET_ACCESS_KEY'] = cfg[:secret_access_key] || cfg['secret_access_key']
|
|
29
|
-
ENV['AWS_REGION']
|
|
29
|
+
ENV['AWS_REGION'] ||= cfg[:region] || cfg['region']
|
|
30
30
|
# Configure AWS with the raw cfg data
|
|
31
31
|
AWS.config(cfg)
|
|
32
32
|
# Configure Aws with a massaged version of the cfg data
|
|
@@ -36,7 +36,7 @@ else
|
|
|
36
36
|
config[:endpoint] = cfg["endpoint"] if cfg["endpoint"]
|
|
37
37
|
Aws.config.update(config)
|
|
38
38
|
else
|
|
39
|
-
# Otherwise print an error message and
|
|
39
|
+
# Otherwise print an error message and exit with an error.
|
|
40
40
|
puts
|
|
41
41
|
puts "-----------------------------------------------------------------------"
|
|
42
42
|
puts "AWS config file missing. Please copy config/aws.yml.example"
|
|
@@ -48,7 +48,7 @@ else
|
|
|
48
48
|
puts " data private to your Ocean system."
|
|
49
49
|
puts "-----------------------------------------------------------------------"
|
|
50
50
|
puts
|
|
51
|
-
|
|
51
|
+
exit 1
|
|
52
52
|
end
|
|
53
53
|
end
|
|
54
54
|
end
|
data/lib/ocean-rails.rb
CHANGED
|
@@ -6,12 +6,13 @@ require "ocean/api_resource"
|
|
|
6
6
|
require "ocean/ocean_resource_model" if defined? ActiveRecord || defined? OceanDynamo
|
|
7
7
|
require "ocean/ocean_resource_controller" if defined? ActionController
|
|
8
8
|
require "ocean/ocean_application_controller"
|
|
9
|
+
|
|
9
10
|
if ENV['RAILS_ENV'] == "production" && ENV['NO_ZEROMQ_LOGGING'].blank?
|
|
10
|
-
puts "YAAAAAAAS"
|
|
11
11
|
require "ocean/zero_log"
|
|
12
12
|
require "ocean/zeromq_logger"
|
|
13
13
|
require "ocean/selective_rack_logger"
|
|
14
14
|
end
|
|
15
|
+
|
|
15
16
|
require "ocean/api_remote_resource"
|
|
16
17
|
|
|
17
18
|
require "aws-sdk-v1" # Remove later
|
data/lib/ocean/version.rb
CHANGED