Skip to content

Commit

Permalink
Merge pull request Veraticus#53 from afrojas/use_ssl
Browse files Browse the repository at this point in the history
use_ssl option added in preparation for fake_dynamo (or equivalent)
  • Loading branch information
Veraticus committed May 22, 2012
2 parents 08ad19e + 82dedb9 commit b5a3395
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/dynamoid/adapter/aws_sdk.rb
Expand Up @@ -18,7 +18,7 @@ module AwsSdk
#
# @since 0.2.0
def connect!
@@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint)
@@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint, :use_ssl => Dynamoid::Config.use_ssl)
end

# Return the established connection.
Expand Down
7 changes: 4 additions & 3 deletions lib/dynamoid/config.rb
Expand Up @@ -3,7 +3,7 @@
require "dynamoid/config/options"

module Dynamoid

# Contains all the basic configuration information required for Dynamoid: both sensible defaults and required fields.
module Config
extend self
Expand All @@ -22,8 +22,9 @@ module Config
option :partitioning, :default => false
option :partition_size, :default => 200
option :endpoint, :default => 'dynamodb.us-east-1.amazonaws.com'
option :use_ssl, :default => true
option :included_models, :default => []

# The default logger for Dynamoid: either the Rails logger or just stdout.
#
# @since 0.2.0
Expand All @@ -37,7 +38,7 @@ def default_logger
def logger
@logger ||= default_logger
end

# If you want to, set the logger manually to any output you'd like. Or pass false or nil to disable logging entirely.
#
# @since 0.2.0
Expand Down

0 comments on commit b5a3395

Please sign in to comment.