@@ -3,7 +3,7 @@ and signed using X.509 certificates and RSA cryptographic keys. To run it: 1. Make sure you have AMQP setup properly (same setup as simpleagent example) - 2. run a secure agent ('nanite-agent --token secure --format :secure') + 2. run a secure agent ('nanite-agent --token secure --format secure') 3. run ./cli.rb This will send a request to the agent telling it to print some output using examples/secure/README @@ -69,7 +69,7 @@ module Nanite end opts.on("-f", "--format FORMAT", "The serialization type to use for transfering data. Can be marshal, json or yaml. Default is marshal") do |fmt| - options[:format] = fmt + options[:format] = fmt.to_sym end opts.on("-d", "--daemonize", "Run #{type} as a daemon") do |d| lib/nanite/config.rb @@ -35,7 +35,7 @@ module Nanite # # identity : identity of this mapper, may be any string # - # format : format to use for packets serialization. Can be :marshal, :json or :yaml. + # format : format to use for packets serialization. Can be :marshal, :json or :yaml or :secure. # Defaults to Ruby's Marshall format. For interoperability with # AMQP clients implemented in other languages, use JSON. # @@ -43,6 +43,9 @@ module Nanite # and ActiveSupport's JSON encoder may cause clashes # if ActiveSupport is loaded after JSON gem. # + # Also using the secure format requires prior initialization of the serializer, see + # SecureSerializer.init + # # log_level : the verbosity of logging, can be debug, info, warn, error or fatal. # # agent_timeout : how long to wait before an agent is considered to be offline lib/nanite/mapper.rb @@ -12,7 +12,7 @@ module Nanite # The secure serializer should not be part of the cascading def initialize(preferred_format = :marshal) preferred_format ||= :marshal - if preferred_format == :secure + if preferred_format.to_s == 'secure' @serializers = [ SecureSerializer ] else preferred_serializer = SERIALIZERS[preferred_format.to_sym] lib/nanite/serializer.rb 443038429657c11831a23c6618d2ee838909b3e1 raphael simon.raphael@gmail.com http://github.com/ezmobius/nanite/commit/a3791c97d2b5caf0996644ed91629897b967fb60 a3791c97d2b5caf0996644ed91629897b967fb60 2009-04-15T21:41:33-07:00 2009-04-15T11:51:18-07:00 Fixed issues with --format argument parsing for secure serializer initialization. Signed-off-by: ezmobius <ez@engineyard.com> e7472a14045d65b15f36454d6614aefce93abd8c ezmobius ez@engineyard.com