rims 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299a57cf042b4a2854a5e040af070bbef170044d8cedbac0c4587559018deb45
-  data.tar.gz: f9f6f5a9654c9b84c7978c4d6aa15d6243150811ee7a70b6110ee1e40eb1753f
+  metadata.gz: 397075dab0a3fa9bdf66a3a3be278b2d1eb3f67f6e2b12e73dcd27bf37190e66
+  data.tar.gz: 8e0734fcdda1d88e9720cefea0c8a2464f4fd4ddb5cfd68c67bc56635c9ef6f3
 SHA512:
-  metadata.gz: 8f7009d59c5a09874933e75a9cea109367fb8f1ef4f1a2718a19536df1055fe7f5e7a60392bc50cf14b964e103ee7c2aa43493b6bf6790c8cba8083605edf3f8
-  data.tar.gz: 78c978afee91b8f5a7ef769a55d4a62d5b2e138d7ef8c6d9ddf5942a997ea772dc1aa317915f72973c42e6b77b7a2cd7acce8a8bae6f9f402d19268524e3b8dc
+  metadata.gz: 5b9fa09f69d35c243e8be71387fe29c4ab3b2237e2a530737e5108dba9371579c2fda3d9fa6bfa7bbebb0ffef3121e6e84863fa111c31b93d1ef8aeeb979c870
+  data.tar.gz: 8cb95a095d7f15f0fe6c7a7ac3bb6d4ec845e6950923c50dc69a93428c082576faaf0a48d83273a923d923dafc6a85eced6affb2c5039408f9b83add0cddd6e9

data/.gitignore

@@ -1,17 +1,19 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/html/
+/load_test/mails/
+/load_test/imap_server/
+/load_test/imap_append/
+/load_test/post_mail/
+/pkg/
+/spec/reports/
+/test/tls/
+/tmp/
+/vendor/
+/Gemfile.lock
+/README.html
+*~
+*.log

data/ChangeLog

@@ -1,5 +1,41 @@
+2019-04-10  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* RIMS version 0.2.3 is released.
+
+	* lib/rims/cmd.rb, lib/rims/lock.rb, lib/rims/protocol/decoder.rb,
+	lib/rims/service.rb: trace all unexpected errors.
+
+2019-04-09  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* test/cmd/test_command.rb: command test.
+
+2019-04-06  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* the server framework is replaced to riser and delete old server
+	framework.
+
+2019-03-26  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/service.rb: service and configuration for
+	riser. implemented backward compatibility configuration.
+
+2019-03-18  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/service.rb: service and configuration for
+	riser. implemented the full parameters to run the server.
+
+2019-03-10  TOKI Yoshinori  <toki@freedom.ne.jp>
+
+	* lib/rims/service.rb: service and configuration for
+	riser. implemented the minimum necessary to run the server.
+
 2019-03-06  TOKI Yoshinori  <toki@freedom.ne.jp>
 
+	* rims.gemspec: add riser to runtime dependency.
+	RISER is a library of Ruby Infrastructure for cooperative
+	multi-thread/multi-process SERver.  the framework of the server is
+	planned to replace with riser.
+
 	* RIMS version 0.2.2 is released.
 
 2019-03-03  TOKI Yoshinori  <toki@freedom.ne.jp>

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 require 'bundler/gem_tasks'
+require 'pathname'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rdoc/task'
@@ -11,11 +12,23 @@ Rake::TestTask.new do |task|
   end
 end
 
+Rake::TestTask.new(:test_cmd) do |task|
+  task.description = 'Run tests for rims command'
+  task.pattern = 'test/cmd/test*.rb'
+  task.options = '-v'
+  if ((ENV.key? 'RUBY_DEBUG') && (! ENV['RUBY_DEBUG'].empty?)) then
+    task.ruby_opts << '-d'
+  end
+end
+
+desc 'Run all tests'
+task :test_all => [ :test, :test_cmd ]
+
 Rake::RDocTask.new do |rd|
   rd.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Build README.html from markdown source.'
+desc 'Build README.html from markdown source'
 task :readme => %w[ README.html ]
 
 file 'README.html' => [ 'README.md' ] do
@@ -23,6 +36,62 @@ file 'README.html' => [ 'README.md' ] do
 end
 CLOBBER.include 'README.html'
 
+namespace :test_cert do
+  tls_dir = Pathname('test/tls')
+
+  directory tls_dir.to_path
+  CLOBBER.include tls_dir.to_path
+
+  desc 'Delete TLS certificate files for test'
+  task :delete do
+    rm_rf tls_dir.to_path
+  end
+
+  ca_priv_key                    = tls_dir / 'ca.priv_key'
+  ca_cert_sign_req               = tls_dir / 'ca.cert_sign_req'
+  ca_cert                        = tls_dir / 'ca.cert'
+  server_priv_key                = tls_dir / 'server.priv_key'
+  server_localhost_cert_sign_req = tls_dir / 'server_localhost.cert_sign_req'
+  server_localhost_cert          = tls_dir / 'server_localhost.cert'
+
+  file ca_priv_key.to_path => [ tls_dir ].map(&:to_path) do
+    sh "openssl genrsa 2048 >#{ca_priv_key}"
+  end
+
+  file ca_cert_sign_req.to_path => [ tls_dir, ca_priv_key ].map(&:to_path) do
+    sh "openssl req -new -key #{ca_priv_key} -sha256 -subj '/C=JP/ST=Tokyo/L=Tokyo/O=Private/OU=Home/CN=*' >#{ca_cert_sign_req}"
+  end
+
+  file ca_cert.to_path => [ tls_dir, ca_priv_key, ca_cert_sign_req ].map(&:to_path) do
+    sh "openssl x509 -req -signkey #{ca_priv_key} -sha256 -days 3650 <#{ca_cert_sign_req} >#{ca_cert}"
+  end
+
+  file server_priv_key.to_path => [ tls_dir ].map(&:to_path) do
+    sh "openssl genrsa 2048 >#{server_priv_key}"
+  end
+
+  file server_localhost_cert_sign_req.to_path => [ tls_dir, server_priv_key ].map(&:to_path) do
+    sh "openssl req -new -key #{server_priv_key} -sha256 -subj '/C=JP/ST=Tokyo/L=Tokyo/O=Private/OU=Home/CN=localhost' >#{server_localhost_cert_sign_req}"
+  end
+
+  file server_localhost_cert.to_path => [ tls_dir, ca_cert, ca_priv_key, server_localhost_cert_sign_req ].map(&:to_path) do
+    sh "openssl x509 -req -CA #{ca_cert} -CAkey #{ca_priv_key} -CAcreateserial -sha256 -days 3650 <#{server_localhost_cert_sign_req} >#{server_localhost_cert}"
+  end
+
+  desc 'Make TLS certificate files for test'
+  task :make => [ ca_priv_key, ca_cert, server_priv_key, server_localhost_cert ].map(&:to_path)
+
+  desc 'Show TLS certificate files for test'
+  task :show => :make do
+    sh "openssl rsa -text -noout <#{ca_priv_key}"
+    sh "openssl req -text -noout <#{ca_cert_sign_req}"
+    sh "openssl x509 -text -noout <#{ca_cert}"
+    sh "openssl rsa -text -noout <#{server_priv_key}"
+    sh "openssl req -text -noout <#{server_localhost_cert_sign_req}"
+    sh "openssl x509 -text -noout <#{server_localhost_cert}"
+  end
+end
+
 # Local Variables:
 # mode: Ruby
 # indent-tabs-mode: nil

data/lib/rims.rb

@@ -2,14 +2,13 @@
 
 require "rims/version"
 
+autoload :OpenSSL, 'openssl'
+
 module RIMS
   autoload :Authentication, 'rims/auth'
-  autoload :BufferedWriter, 'rims/server'
   autoload :Checksum_KeyValueStore, 'rims/cksum_kvs'
   autoload :Cmd, 'rims/cmd'
-  autoload :Config, 'rims/server'
   autoload :DB, 'rims/db'
-  autoload :Daemon, 'rims/daemon'
   autoload :Error, 'rims/error'
   autoload :GDBM_KeyValueStore, 'rims/gdbm_kvs'
   autoload :GlobalDB, 'rims/db'
@@ -23,7 +22,6 @@ module RIMS
   autoload :MailboxDB, 'rims/db'
   autoload :MessageDB, 'rims/db'
   autoload :MessageSetSyntaxError, 'rims/protocol'
-  autoload :Multiplexor, 'rims/server'
   autoload :ObjectPool, 'rims/pool'
   autoload :Password, 'rims/passwd'
   autoload :Protocol, 'rims/protocol'
@@ -32,8 +30,8 @@ module RIMS
   autoload :ReadLockError, 'rims/lock'
   autoload :ReadLockTimeoutError, 'rims/lock'
   autoload :ReadWriteLock, 'rims/lock'
-  autoload :Server, 'rims/server'
   autoload :ServerResponseChannel, 'rims/channel'
+  autoload :Service, 'rims/service'
   autoload :SyntaxError, 'rims/protocol'
   autoload :Test, 'rims/test'
   autoload :WriteLockError, 'rims/lock'

data/lib/rims/auth.rb

@@ -40,6 +40,10 @@ module RIMS
         klass = PLUG_IN[name] or raise KeyError, "not found a password source plug-in: #{name}"
         klass.build_from_conf(config)
       end
+
+      def plug_in_names
+        PLUG_IN.keys
+      end
     end
 
     def initialize(hostname: 'rims',
@@ -49,8 +53,7 @@ module RIMS
       @time_source = time_source
       @random_string_source = random_string_source
       @capability = %w[ PLAIN CRAM-MD5 ]
-      @plain_src = Password::PlainSource.new
-      @passwd_src_list = [ @plain_src ]
+      @passwd_src_list = []
     end
 
     attr_reader :hostname
@@ -79,11 +82,6 @@ module RIMS
       end
     end
 
-    def entry(username, password)
-      @plain_src.entry(username, password)
-      self
-    end
-
     def user?(username)
       @passwd_src_list.any?{|passwd_src| passwd_src.user? username }
     end

data/lib/rims/cmd.rb

@@ -1,13 +1,23 @@
 # -*- coding: utf-8 -*-
 
+require 'json'
 require 'logger'
 require 'net/imap'
 require 'optparse'
 require 'pp'if $DEBUG
+require 'riser'
 require 'syslog'
 require 'syslog/logger'
 require 'yaml'
 
+OptionParser.accept(JSON) do |json_data, *_|
+  begin
+    JSON.load(json_data)
+  rescue
+    raise OptionParser::InvalidArgument, json_data
+  end
+end
+
 module RIMS
   module Cmd
     CMDs = {}
@@ -46,20 +56,20 @@ module RIMS
       end
       options.parse!(args)
 
-      STDERR.puts "usage: #{File.basename($0)} command options"
-      STDERR.puts ""
-      STDERR.puts "commands:"
+      puts "usage: #{File.basename($0)} command options"
+      puts ""
+      puts "commands:"
       w = CMDs.keys.map{|k| k.length }.max + 4
       fmt = "    %- #{w}s%s"
       CMDs.each do |cmd_name, cmd_entry|
         if ((! show_debug_command) && (cmd_name =~ /^debug/)) then
           next
         end
-        STDERR.puts format(fmt, cmd_name, cmd_entry[:description])
+        puts format(fmt, cmd_name, cmd_entry[:description])
       end
-      STDERR.puts ""
-      STDERR.puts "command help options:"
-      STDERR.puts "    -h, --help"
+      puts ""
+      puts "command help options:"
+      puts "    -h, --help"
       0
     end
     command_function :cmd_help, "Show this message."
@@ -71,109 +81,592 @@ module RIMS
     end
     command_function :cmd_version, 'Show software version.'
 
-    def make_server_config(options)
-      conf = RIMS::Config.new
-      conf.load(base_dir: Dir.getwd)
+    class ServiceConfigChainBuilder
+      def initialize
+        @build = proc{ Service::Configuration.new }
+      end
+
+      def chain(&block)
+        parent = @build
+        @build = proc{ block.call(parent.call) }
+        self
+      end
+
+      def call
+        @build.call
+      end
+    end
+
+    def make_service_config(options)
+      build = ServiceConfigChainBuilder.new
+      build.chain{|c| c.load(base_dir: Dir.getwd) }
+
+      options.summary_width = 37
+      log_level_list = %w[ debug info warn error fatal unknown ]
 
       options.on('-h', '--help', 'Show this message.') do
         puts options
         exit
       end
       options.on('-f', '--config-yaml=CONFIG_FILE',
-                 "Load optional parameters from CONFIG_FILE.") do |path|
-        conf.load_config_yaml(path)
+                 String,
+                 "Load optional parameters from CONFIG_FILE."
+                ) do |path|
+        build.chain{|c| c.load_yaml(path) }
       end
-      options.on('-d', '--base-dir=DIR',
-                 "Directory that places log file, mailbox database, etc. default is current directory.") do |path|
-        conf.load(base_dir: path)
+      options.on('-r', '--required-feature=FEATURE',
+                 String,
+                 "Add required feature."
+                ) do |feature|
+        require(feature)
+        build.chain{|c| c.load(required_features: [ feature ]) }
       end
-      level_list = %w[ debug info warn error fatal ]
-      stdout_list = level_list + %w[ quiet ]
-      options.on('-v', '--log-stdout=LEVEL', stdout_list,
-                 "Stdout logging level (#{stdout_list.join(' ')}). default is `info'.") do |level|
-        conf.load(log_stdout: level)
+      options.on('-d', '--base-dir=DIR',
+                 String,
+                 "Directory that places log file, mailbox database, etc. default is current directory."
+                ) do |path|
+        build.chain{|c| c.load(base_dir: path) }
       end
       options.on('--log-file=FILE',
-                 "Name of log file. the directory part preceding file name is ignored. default is `imap.log'.") do |path|
-        conf.load(log_file: path)
+                 String,
+                 "Name of log file. default is `#{Service::DEFAULT_CONFIG.make_file_logger_params[0]}'."
+                ) do |path|
+        build.chain{|c|
+          c.load(logger: {
+                   file: {
+                     path: path
+                   }
+                 })
+        }
+      end
+      options.on('-l', '--log-level=LEVEL',
+                 log_level_list,
+                 "Logging level (#{log_level_list.join(' ')}). default is `" +
+                 Service::DEFAULT_CONFIG.make_file_logger_params[-1][:level] +
+                 "'."
+                ) do |level|
+        build.chain{|c|
+          c.load(logging: {
+                   file: {
+                     level: level
+                   }
+                 })
+        }
+      end
+      options.on('--log-shift-age=NUMBER',
+                 Integer,
+                 'Number of old log files to keep.'
+                ) do |num|
+        build.chain{|c|
+          c.load(logging: {
+                   file: {
+                     shift_age: num
+                   }
+                 })
+        }
       end
-      options.on('-l', '--log-level=LEVEL', level_list,
-                 "Logging level (#{level_list.join(' ')}). default is `info'.") do |level|
-        conf.load(log_level: level)
+      options.on('--log-shift-age-daily',
+                 'Frequency of daily log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   file: {
+                     shift_age: 'daily'
+                   }
+                 })
+        }
       end
-      options.on('--log-shift-age=NUMBER', Integer, 'Number of old log files to keep.') do |num|
-        conf.load(log_shift_age: num)
+      options.on('--log-shift-age-weekly',
+                 'Frequency of weekly log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   file: {
+                     shift_age: 'weekly'
+                   }
+                 })
+        }
+      end
+      options.on('--log-shift-age-monthly',
+                 'Frequency of monthly log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   file: {
+                     shift_age: 'monthly'
+                   }
+                 })
+        }
       end
-      options.on('--log-shift-age-daily', 'Frequency of daily log rotation.') do
-        conf.load(log_shift_age: 'daily')
+      options.on('--log-shift-size=SIZE',
+                 Integer,
+                 'Maximum logfile size.'
+                ) do |size|
+        build.chain{|c|
+          c.load(logger: {
+                   file: {
+                     shift_size: size
+                   }
+                 })
+        }
+      end
+      options.on('-v', '--log-stdout=LEVEL',
+                 log_level_list + %w[  quiet ],
+                 "Stdout logging level (#{(log_level_list + %w[ quiet ]).join(' ')}). default is `" +
+                 Service::DEFAULT_CONFIG.make_stdout_logger_params[-1][:level] +
+                 "'."
+                ) do |level|
+        if (level == 'quiet') then
+          level = 'unknown'
+        end
+        build.chain{|c|
+          c.load(logging: {
+                   stdout: {
+                     level: level
+                   }
+                 })
+        }
       end
-      options.on('--log-shift-age-weekly', 'Frequency of weekly log rotation.') do
-        conf.load(log_shift_age: 'weekly')
+      options.on('--protocol-log-file=FILE',
+                 String,
+                 "Name of log file. default is `#{Service::DEFAULT_CONFIG.make_protocol_logger_params[0]}'."
+                ) do |path|
+        build.chain{|c|
+          c.load(logger: {
+                   protocol: {
+                     path: path
+                   }
+                 })
+        }
       end
-      options.on('--log-shift-age-monthly', 'Frequency of monthly log rotation.') do
-        conf.load(log_shift_age: 'monthly')
+      options.on('-p', '--protocol-log-level=LEVEL',
+                 log_level_list,
+                 "Logging level (#{log_level_list.join(' ')}). default is `" +
+                 Service::DEFAULT_CONFIG.make_protocol_logger_params[-1][:level] +
+                 "'."
+                ) do |level|
+        build.chain{|c|
+          c.load(logging: {
+                   protocol: {
+                     level: level
+                   }
+                 })
+        }
       end
-      options.on('--log-shift-size=SIZE', Integer, 'Maximum logfile size.') do |size|
-        conf.load(log_shift_size: size)
+      options.on('--protocol-log-shift-age=NUMBER',
+                 Integer,
+                 'Number of old log files to keep.'
+                ) do |num|
+        build.chain{|c|
+          c.load(logging: {
+                   protocol: {
+                     shift_age: num
+                   }
+                 })
+        }
       end
-      options.on('--kvs-type=TYPE', %w[ gdbm ],
-                 "Choose the key-value store type of mailbox database. load plug-in on config.yml.") do |type|
-        conf.load(key_value_store_type: type)
+      options.on('--protocol-log-shift-age-daily',
+                 'Frequency of daily log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   protocol: {
+                     shift_age: 'daily'
+                   }
+                 })
+        }
       end
-      options.on('--[no-]use-kvs-cksum',
-                 "Enable/disable data checksum at key-value store. default is enabled.") do |use|
-        conf.load(use_key_value_store_checksum: use)
+      options.on('--protocol-log-shift-age-weekly',
+                 'Frequency of weekly log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   protocol: {
+                     shift_age: 'weekly'
+                   }
+                 })
+        }
       end
-      options.on('-u', '--username=NAME',
-                 "Username to login IMAP server. required parameter to start server.") do |name|
-        conf.load(username: name)
+      options.on('--protocol-log-shift-age-monthly',
+                 'Frequency of monthly log rotation.'
+                ) do
+        build.chain{|c|
+          c.load(logger: {
+                   protocol: {
+                     shift_age: 'monthly'
+                   }
+                 })
+        }
       end
-      options.on('-w', '--password=PASS',
-                 "Password to login IMAP server. required parameter to start server.") do |pass|
-        conf.load(password: pass)
+      options.on('--protocol-log-shift-size=SIZE',
+                 Integer,
+                 'Maximum logfile size.'
+                ) do |size|
+        build.chain{|c|
+          c.load(logger: {
+                   protocol: {
+                     shift_size: size
+                   }
+                 })
+        }
+      end
+      options.on('--[no-]daemonize',
+                 "Daemonize server process. effective only with daemon command."
+                ) do |daemonize|
+        build.chain{|c|
+          c.load(daemon: {
+                   daemonize: daemonize
+                 })
+        }
+      end
+      options.on('--[no-]daemon-debug',
+                 "Debug daemon. effective only with daemon command."
+                ) do |debug|
+        build.chain{|c|
+          c.load(daemon: {
+                   debug: debug
+                 })
+        }
+      end
+      options.on('--status-file=FILE',
+                 String,
+                 "Name of status file. effective only with daemon command. default is `#{Service::DEFAULT_CONFIG.status_file}'."
+                ) do |path|
+        build.chain{|c|
+          c.load(daemon: {
+                   status_file: path
+                 })
+        }
+      end
+      options.on('--privilege-user=USER',
+                 String,
+                 "Privilege user name or ID for server process. effective only with daemon command."
+                ) do |user|
+        build.chain{|c|
+          c.load(daemon: {
+                   server_privileged_user: user
+                 })
+        }
+      end
+      options.on('--privilege-group=GROUP',
+                 String,
+                 "Privilege group name or ID for server process. effective only with daemon command."
+                ) do |group|
+        build.chain{|c|
+          c.load(daemon: {
+                   server_privileged_group: group
+                 })
+        }
+      end
+      options.on('-s', '--listen=HOST_PORT',
+                 String,
+                 "Listen socket address. default is `#{Service::DEFAULT_CONFIG.listen_address}'"
+                ) do |host_port|
+        build.chain{|c|
+          c.load(server: {
+                   listen_address: host_port
+                 })
+        }
+      end
+      options.on('--accept-polling-timeout=SECONDS',
+                 Float
+                ) do |seconds|
+        build.chain{|c|
+          c.load(server: {
+                   accept_polling_timeout_seconds: seconds
+                 })
+        }
+      end
+      options.on('--thread-num=NUMBER',
+                 Integer
+                ) do |num|
+        build.chain{|c|
+          c.load(server: {
+                   thread_num: num
+                 })
+        }
+      end
+      options.on('--thread-queue-size=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(server: {
+                   thread_queue_size: size
+                 })
+        }
+      end
+      options.on('--thread-queue-polling-timeout=SECONDS',
+                 Float
+                ) do |seconds|
+        build.chain{|c|
+          c.load(server: {
+                   thread_queue_polling_timeout_seconds: seconds
+                 })
+        }
+      end
+      options.on('--send-buffer-limit=SIZE',
+                 Integer
+                ) do |size|
+        build.chain{|c|
+          c.load(server: {
+                   send_buffer_limit_size: size
+                 })
+        }
+      end
+      options.on('--read-lock-timeout=SECONDS',
+                 Float
+                ) do |seconds|
+        build.chain{|c|
+          c.load(lock: {
+                   read_lock_timeout_seconds: seconds
+                 })
+        }
+      end
+      options.on('--write-lock-timeout=SECONDS',
+                 Float
+                ) do |seconds|
+        build.chain{|c|
+          c.load(lock: {
+                   write_lock_timeout_seconds: seconds
+                 })
+        }
+      end
+      options.on('--cleanup-write-lock-timeout=SECONDS',
+                 Float
+                ) do |seconds|
+        build.chain{|c|
+          c.load(lock: {
+                   cleanup_write_lock_timeout_seconds: seconds
+                 })
+        }
+      end
+      options.on('--meta-kvs-type=TYPE',
+                 KeyValueStore::FactoryBuilder.plug_in_names,
+                 "Choose key-value store type of mailbox meta-data database" +
+                 if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
+                   ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
+                 else
+                   ''
+                 end +
+                 ". default is `" +
+                 KeyValueStore::FactoryBuilder.plug_in_names[0] +
+                 "'."
+                ) do |kvs_type|
+        build.chain{|c|
+          c.load(storage: {
+                   meta_key_value_store: {
+                     type: kvs_type
+                   }
+                 })
+        }
+      end
+      options.on('--meta-kvs-config=JSON_DATA',
+                 JSON,
+                 "Configuration for key-value store of mailbox meta-data database."
+                ) do |json_data|
+        build.chain{|c|
+          c.load(storage: {
+                   meta_key_value_store: {
+                     configuration: json_data
+                   }
+                 })
+        }
+      end
+      options.on('--[no-]use-meta-kvs-checksum',
+                 "Enable/disable data checksum at key-value store of mailbox meta-data database. default is " +
+                 if (Service::DEFAULT_CONFIG.make_meta_key_value_store_params.middleware_list.include? Checksum_KeyValueStore) then
+                   'enabled'
+                 else
+                   'disbled'
+                 end +
+                 "."
+                ) do |use_checksum|
+        build.chain{|c|
+          c.load(storage: {
+                   meta_key_value_store: {
+                     use_checksum: use_checksum
+                   }
+                 })
+        }
       end
+      options.on('--text-kvs-type=TYPE',
+                 KeyValueStore::FactoryBuilder.plug_in_names,
+                 "Choose key-value store type of mailbox text-data database" +
+                 if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
+                   ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
+                 else
+                   ''
+                 end +
+                 ". default is `" +
+                 KeyValueStore::FactoryBuilder.plug_in_names[0] +
+                 "'."
+                ) do |kvs_type|
+        build.chain{|c|
+          c.load(storage: {
+                   text_key_value_store: {
+                     type: kvs_type
+                   }
+                 })
+        }
+      end
+      options.on('--text-kvs-config=JSON_DATA',
+                 JSON,
+                 "Configuration for key-value store of mailbox text-data database."
+                ) do |json_data|
+        build.chain{|c|
+          c.load(storage: {
+                   text_key_value_store: {
+                     configuration: json_data
+                   }
+                 })
+        }
+      end
+      options.on('--[no-]use-text-kvs-checksum',
+                 "Enable/disable data checksum at key-value store of mailbox text-data database. default is " +
+                 if (Service::DEFAULT_CONFIG.make_text_key_value_store_params.middleware_list.include? Checksum_KeyValueStore) then
+                   'enabled'
+                 else
+                   'disbled'
+                 end +
+                 "."
+                ) do |use_checksum|
+        build.chain{|c|
+          c.load(storage: {
+                   text_key_value_store: {
+                     use_checksum: use_checksum
+                   }
+                 })
+        }
+      end
+      options.on('--auth-hostname=HOSTNAME',
+                 String,
+                 "Hostname to authenticate with cram-md5. default is `#{Service::DEFAULT_CONFIG.make_authentication.hostname}'."
+                ) do |hostname|
+        build.chain{|c|
+          c.load(authentication: {
+                   hostname: hostname
+                 })
+        }
+      end
+      options.on('--passwd-config=TYPE_JSONDATA',
+                 /([^:]+)(?::(.*))?/,
+                 "Password source type (#{Authentication.plug_in_names.join(',')}) and configuration. format is `[type]:[json_data]'."
+                ) do |_, type, json_data|
+        build.chain{|c|
+          c.load(authentication: {
+                   password_sources: [
+                     { type: type,
+                       configuration: JSON.load(json_data)
+                     }
+                   ]
+                 })
+        }
+      end
+      options.on('--passwd-file=TYPE_FILE',
+                 /([^:]+):(.+)/,
+                 "Password source type (#{Authentication.plug_in_names.join(',')}) and configuration file. format is `[type]:[file]'."
+                ) do |_, type, path|
+        build.chain{|c|
+          c.load(authentication: {
+                   password_sources: [
+                     { type: type,
+                       configuration_file: path
+                     }
+                   ]
+                 })
+        }
+      end
+      options.on('--mail-delivery-user=USERNAME',
+                 String,
+                 "Username authorized to deliver messages to any mailbox. default is `#{Service::DEFAULT_CONFIG.mail_delivery_user}'"
+                ) do |username|
+        build.chain{|c|
+          c.load(authorization: {
+                   mail_delivery_user: username
+                 })
+        }
+      end
+
       options.on('--imap-host=HOSTNAME',
-                 "IMAP server hostname or IP address for the server to bind. default is `#{Server::DEFAULT[:imap_host]}'.") do |host|
-        conf.load(imap_host: host)
+                 String,
+                 'Deplicated.'
+                ) do |host|
+        warn("warning: `--imap-host=HOSTNAME' is deplicated option and should use `--listen=HOST_PORT'.")
+        build.chain{|c| c.load(imap_host: host) }
       end
       options.on('--imap-port=PORT',
-                 "IMAP server port number or service name for the server to bind. default is `#{Server::DEFAULT[:imap_port]}'.") do |value|
-        if (value =~ /\A\d+\z/) then
+                 String,
+                 'Deplicated.'
+                ) do |value|
+        warn("warning: `--imap-port=PORT' is deplicated option and should use `--listen=HOST_PORT'.")
+        if (value =~ /\A \d+ \z/x) then
           port_number = value.to_i
-          conf.load(imap_port: port_number)
+          build.chain{|c| c.load(imap_port: port_number) }
         else
           service_name = value
-          conf.load(imap_port: service_name)
+          build.chain{|c| c.load(imap_port: service_name) }
         end
       end
-      options.on('--privilege-user=NAME',
-                 "Privilege user name or ID for server process. default is #{Server::DEFAULT[:process_privilege_uid]}.") do |name|
-        conf.load(process_privilege_user: name)
+      options.on('--ip-addr=IP_ADDR',
+                 String,
+                 'Deplicated.'
+                ) do |ip_addr|
+        warn("warning: `--ip-addr=IP_ADDR' is deplicated option and should use `--listen=HOST_PORT'.")
+        build.chain{|c| c.load(ip_addr: ip_addr) }
       end
-      options.on('--privilege-group=NAME',
-                 "Privilege group name or ID for server process. default is #{Server::DEFAULT[:process_privilege_gid]}.") do |name|
-        conf.load(process_privilege_user: name)
+      options.on('--ip-port=PORT',
+                 Integer,
+                 'Deplicated.'
+                ) do |port|
+        warn("warning: `--ip-port=PORT' is deplicated option and should use `--listen=HOST_PORT'.")
+        build.chain{|c| c.load(ip_port: port) }
       end
-
-      options.on('--ip-addr=IP_ADDR', 'obsoleted.') do |ip_addr|
-        warn("warning: `--ip-addr=IP_ADDR' is obsoleted option and should use `--imap-host=HOSTNAME'.")
-        conf.load(ip_addr: ip_addr)
+      options.on('--kvs-type=TYPE',
+                 KeyValueStore::FactoryBuilder.plug_in_names,
+                 'Deplicated.'
+                ) do |kvs_type|
+        warn("warning: `--kvs-type=TYPE' is deplicated option and should use `--meta-kvs-type=TYPE' or `--text-kvs-type=TYPE'.")
+        build.chain{|c| c.load(key_value_store_type: kvs_type) }
       end
-      options.on('--ip-port=PORT', Integer, 'obsoleted.') do |port|
-        warn("warning: `--ip-port=PORT' is obsoleted option and should use `--imap-port=PORT'.")
-        conf.load(ip_port: port)
+      options.on('--[no-]use-kvs-cksum',
+                 'Deplicated.'
+                ) do |use_checksum|
+        warn("warning: `--[no-]use-kvs-cksum' is deplicated option and should use `--[no-]use-meta-kvs-checksum' or `--[no-]use-text-kvs-checksum'.")
+        build.chain{|c| c.load(use_key_value_store_checksum: use_checksum) }
+      end
+      options.on('-u', '--username=NAME',
+                 String,
+                 'Deplicated.'
+                ) do |name|
+        warn("warning: `--username=NAME' is deplicated option and should use `--passwd-config=TYPE_JSONDATA' or `--passwd-file=TYPE_FILE'.")
+        build.chain{|c| c.load(username: name) }
+      end
+      options.on('-w', '--password=PASS',
+                 String,
+                 'Deplicated.'
+                ) do |pass|
+        warn("warning: `--password=PASS' is deplicated option and should use `--passwd-config=TYPE_JSONDATA' or `--passwd-file=TYPE_FILE'.")
+        build.chain{|c| c.load(password: pass) }
       end
 
-      conf
+      build
     end
-    module_function :make_server_config
+    module_function :make_service_config
 
     def cmd_server(options, args)
-      conf = make_server_config(options)
+      build = make_service_config(options)
       options.parse!(args)
 
-      server = conf.build_server
-      server.start
+      config = build.call
+      server = Riser::SocketServer.new
+      service = RIMS::Service.new(config)
+      service.setup(server)
+
+      Signal.trap(:INT) { server.signal_stop_forced }
+      Signal.trap(:TERM) { server.signal_stop_graceful }
+
+      listen_address = Riser::SocketAddress.parse(config.listen_address)
+      server.start(listen_address.open_server)
 
       0
     end
@@ -190,7 +683,7 @@ module RIMS
       end
       private :imap_res2str
 
-      IMAP_AUTH_TYPE_LIST = %w[ login plain cram-md5 ]
+      IMAP_AUTH_TYPE_LIST  = %w[ login plain cram-md5 ]
       MAIL_DATE_PLACE_LIST = [ :servertime, :localtime, :filetime, :mailheader ]
 
       VERBOSE_OPTION_LIST = [
@@ -198,35 +691,33 @@ module RIMS
       ]
 
       def self.make_imap_connect_option_list(imap_host: 'localhost', imap_port: 143, imap_ssl: false, auth_type: 'login', username: nil)
-        [ [ :imap_host, imap_host, '-n', '--host=HOSTNAME', "Hostname or IP address to connect IMAP server. default is `#{imap_host}'." ],
-          [ :imap_port, imap_port, '-o', '--port=PORT', Integer, "Server port number or service name to connect IMAP server. default is #{imap_port}." ],
-          [ :imap_ssl, imap_ssl, '-s', '--[no-]use-ssl', "Enable SSL/TLS connection. default is #{imap_ssl ? 'enabled' : 'disabled'}." ],
-          [ :username, username, '-u', '--username=NAME',
-            "Username to login IMAP server. " + if (username) then
-                                                  "default is `#{username}'."
-                                                else
-                                                  "required parameter to connect server."
-                                                end ],
-          [ :password, nil, '-w', '--password=PASS', "Password to login IMAP server. required parameter to connect server." ],
-          [ :auth_type, auth_type, '--auth-type=METHOD', IMAP_AUTH_TYPE_LIST,
-            "Choose authentication method type (#{IMAP_AUTH_TYPE_LIST.join(' ')}). default is `#{auth_type}'." ]
+        [ [ :imap_host,  imap_host, '-n', '--host=HOSTNAME',                  "Hostname or IP address to connect IMAP server. default is `#{imap_host}'." ],
+          [ :imap_port,  imap_port, '-o', '--port=PORT', Integer,             "Server port number or service name to connect IMAP server. default is #{imap_port}." ],
+          [ :imap_ssl,   imap_ssl,  '-s', '--[no-]use-ssl',                   "Enable SSL/TLS connection. default is #{imap_ssl ? 'enabled' : 'disabled'}." ],
+          [ :ca_cert,    nil,              '--ca-cert=PATH',                  "CA cert file or directory." ],
+          [ :ssl_params, {},               '--ssl-params=JSON_DATA', JSON,    "SSLContext#set_params as parameters." ],
+          [ :username,   username,  '-u', '--username=NAME',                  "Username to login IMAP server. " +
+                                                                              (username ? "default is `#{username}'." : "required parameter to connect server.") ],
+          [ :password,  nil,       '-w', '--password=PASS',                   "Password to login IMAP server. required parameter to connect server." ],
+          [ :auth_type, auth_type, '--auth-type=METHOD', IMAP_AUTH_TYPE_LIST, "Choose authentication method type (#{IMAP_AUTH_TYPE_LIST.join(' ')}). " +
+                                                                              "default is `#{auth_type}'." ]
         ]
       end
 
-      IMAP_CONNECT_OPTION_LIST = self.make_imap_connect_option_list
-      POST_MAIL_CONNECT_OPTION_LIST = self.make_imap_connect_option_list(imap_port: Server::DEFAULT[:imap_port],
-                                                                         username: Server::DEFAULT[:mail_delivery_user])
+      IMAP_CONNECT_OPTION_LIST      = make_imap_connect_option_list
+      POST_MAIL_CONNECT_OPTION_LIST = make_imap_connect_option_list(imap_port: Riser::SocketAddress.parse(Service::DEFAULT_CONFIG.listen_address).port,
+                                                                    username: Service::DEFAULT_CONFIG.mail_delivery_user)
 
       IMAP_MAILBOX_OPTION_LIST = [
-        [ :mailbox, 'INBOX', '-m', '--mailbox=NAME', "Set mailbox name to append messages. default is `INBOX'." ]
+        [ :mailbox, 'INBOX', '-m', '--mailbox=NAME', String, "Set mailbox name to append messages. default is `INBOX'." ]
       ]
 
       IMAP_STORE_FLAG_OPTION_LIST = [
         [ :store_flag_answered, false, '--[no-]store-flag-answered', "Store answered flag on appending messages to mailbox. default is no flag." ],
-        [ :store_flag_flagged, false, '--[no-]store-flag-flagged', "Store flagged flag on appending messages to mailbox. default is no flag." ],
-        [ :store_flag_deleted, false, '--[no-]store-flag-deleted', "Store deleted flag on appending messages to mailbox. default is no flag." ],
-        [ :store_flag_seen, false, '--[no-]store-flag-seen', "Store seen flag on appending messages to mailbox. default is no flag." ],
-        [ :store_flag_draft, false, '--[no-]store-flag-draft', "Store draft flag on appending messages to mailbox. default is no flag." ]
+        [ :store_flag_flagged,  false, '--[no-]store-flag-flagged',  "Store flagged flag on appending messages to mailbox. default is no flag." ],
+        [ :store_flag_deleted,  false, '--[no-]store-flag-deleted',  "Store deleted flag on appending messages to mailbox. default is no flag." ],
+        [ :store_flag_seen,     false, '--[no-]store-flag-seen',     "Store seen flag on appending messages to mailbox. default is no flag." ],
+        [ :store_flag_draft,    false, '--[no-]store-flag-draft',    "Store draft flag on appending messages to mailbox. default is no flag." ]
       ]
 
       MAIL_DATE_OPTION_LIST = [
@@ -235,11 +726,43 @@ module RIMS
         ]
       ]
 
+      def self.symbolize_string_key(collection)
+        case (collection)
+        when Hash
+          Hash[collection.map{|key, value|
+                 [ symbolize_string_key(key),
+                   case (value)
+                   when Hash, Array
+                     symbolize_string_key(value)
+                   else
+                     value
+                   end
+                 ]
+               }]
+        when Array
+          collection.map{|value|
+            case (value)
+            when Hash, Array
+              symbolize_string_key(value)
+            else
+              value
+            end
+          }
+        else
+          case (value = collection)
+          when String
+            value.to_sym
+          else
+            value
+          end
+        end
+      end
+
       def initialize(options, option_list)
         @options = options
         @option_list = option_list
         @conf = {}
-        for key, value, *option_description in option_list
+        for key, value, *_option_description in option_list
           @conf[key] = value
         end
       end
@@ -282,17 +805,22 @@ module RIMS
 
       def load_config_option
         @options.on('-f', '--config-yaml=CONFIG_FILE',
+                    String,
                     "Load optional parameters from CONFIG_FILE.") do |path|
-          for name, value in YAML.load_file(path)
-            @conf[name.to_sym] = value
-          end
+          config = YAML.load_file(path)
+          symbolized_config = self.class.symbolize_string_key(config)
+          @conf.update(symbolized_config)
         end
 
         self
       end
 
-      def load_library_option
-        @options.on('-r', '--load-library=LIBRARY', 'require LIBRARY.') do |library|
+      def required_feature_option
+        @options.on('-r', '--required-feature=FEATURE', String, 'Add required feature.') do |feature|
+          require(feature)
+        end
+        @options.on('--load-library=LIBRARY', String, 'Deplicated.') do |library|
+          warn("warning: `--load-library=LIBRARY' is deplicated option and should use `--required-feature=FEATURE'.")
           require(library)
         end
 
@@ -301,12 +829,27 @@ module RIMS
 
       def key_value_store_option
         @conf[:key_value_store_type] = GDBM_KeyValueStore
-        @options.on('--kvs-type=TYPE', 'Choose the key-value store type.') do |kvs_type|
+        @options.on('--kvs-type=TYPE',
+                    KeyValueStore::FactoryBuilder.plug_in_names,
+                    "Choose key-value store type of mailbox database" +
+                    if (KeyValueStore::FactoryBuilder.plug_in_names.length > 1) then
+                      ' (' + KeyValueStore::FactoryBuilder.plug_in_names.join(' ') + ')'
+                    else
+                      ''
+                    end +
+                    ". default is `" +
+                    KeyValueStore::FactoryBuilder.plug_in_names[0] +
+                    "'."
+                   ) do |kvs_type|
           @conf[:key_value_store_type] = KeyValueStore::FactoryBuilder.get_plug_in(kvs_type)
         end
 
         @conf[:use_key_value_store_checksum] = true
-        @options.on('--[no-]use-kvs-cksum', 'Enable/disable data checksum at key-value store. default is enabled.') do |use_checksum|
+        @options.on('--[no-]use-kvs-checksum', 'Enable/disable data checksum at key-value store. default is enabled.') do |use_checksum|
+          @conf[:use_key_value_store_checksum] = use_checksum
+        end
+        @options.on('--[no-]use-kvs-cksum', 'Deplicated.') do |use_checksum|
+          warn("warning: `--[no-]use-kvs-cksum' is deplicated option and should use `--[no-]use-kvs-checksum'.")
           @conf[:use_key_value_store_checksum] = use_checksum
         end
 
@@ -338,7 +881,24 @@ module RIMS
           raise 'need for username and password.'
         end
 
-        imap = Net::IMAP.new(@conf[:imap_host], port: @conf[:imap_port], ssl: @conf[:imap_ssl])
+        args = [ @conf[:imap_host] ]
+        if (@conf[:imap_ssl]) then
+          if (@conf[:ssl_params].empty?) then
+            args << @conf[:imap_port]
+            args << @conf[:imap_ssl]
+            args << @conf[:ca_cert]
+          else
+            kw_args = {
+              port: @conf[:imap_port],
+              ssl: @conf[:ssl_params]
+            }
+            args << kw_args
+          end
+        else
+          args << @conf[:imap_port]
+        end
+
+        imap = Net::IMAP.new(*args)
         begin
           if (@conf[:verbose]) then
             puts "server greeting: #{imap_res2str(imap.greeting)}"
@@ -358,7 +918,7 @@ module RIMS
 
           yield(imap)
         ensure
-          Error.suppress_2nd_error_at_resource_closing{ imap.logout }
+          imap.logout
         end
       end
 
@@ -408,15 +968,20 @@ module RIMS
 
     def cmd_daemon(options, args)
       conf = Config.new(options,
-                        [ [ :is_daemon,
+                        [ [ :use_status_code,
                             true,
+                            '--[no-]status-code',
+                            "Return the result of `status' operation as an exit code."
+                          ],
+                          [ :is_daemon,
+                            nil,
                             '--[no-]daemon',
-                            'Start daemon process. default is enabled.'
+                            'Obsoleted.'
                           ],
                           [ :is_syslog,
-                            true,
+                            nil,
                             '--[no-]syslog',
-                            'Syslog daemon messages. default is enabled.'
+                            'Obsoleted.'
                           ]
                         ])
       conf.help_option(add_banner: ' start/stop/restart/status [server options]')
@@ -426,73 +991,75 @@ module RIMS
       pp args if $DEBUG
 
       operation = args.shift or raise 'need for daemon operation.'
-      server_args = args.dup
       server_options = OptionParser.new
-      server_conf = make_server_config(server_options)
-      server_options.parse!(server_args)
-      stat_file_path = Daemon.make_stat_file_path(server_conf.base_dir)
-      pp server_conf if $DEBUG
-
-      case (operation)
-      when 'start'
-        if (conf[:is_daemon]) then
-          args += %w[ --log-stdout=quiet ]
-          Process.daemon(true)
-        end
+      build = make_service_config(server_options)
+      server_options.parse!(args)
 
-        logger = Multiplexor.new
-        unless (conf[:is_daemon]) then
-          stdout_logger = Logger.new(STDOUT)
-          def stdout_logger.close # should not be closed at child process.
-            nil
-          end
-          logger.add(stdout_logger)
-        end
-        if (conf[:is_syslog]) then
-          syslog_logger = Syslog::Logger.new('rims-daemon')
-          def syslog_logger.close # should be closed at child process.
-            Syslog.close
-          end
-          logger.add(syslog_logger)
-        end
+      unless (conf[:is_daemon].nil?) then
+        warn("warning: `--[no-]daemon' is obsoleted option and no effect. use server option `--[no-]daemonize'.")
+      end
+      unless (conf[:is_syslog].nil?) then
+        warn("warning: `--[no-]syslog' is obsoleted option and no effect.")
+      end
 
-        daemon = Daemon.new(stat_file_path, logger, server_options: args)
+      svc_conf = build.call
+      pp svc_conf if $DEBUG
 
-        [ [ Daemon::RELOAD_SIGNAL_LIST, proc{ daemon.reload_server } ],
-          [ Daemon::RESTART_SIGNAL_LIST, proc{ daemon.restart_server } ],
-          [ Daemon::STOP_SIGNAL_LIST, proc{ daemon.stop_server } ]
-        ].each do |signal_list, signal_command|
-          for sig_name in signal_list
-            Signal.trap(sig_name, signal_command)
-          end
+      status_file_locked = lambda{
+        begin
+          File.open(svc_conf.status_file, File::WRONLY) {|lock_file|
+            ! lock_file.flock(File::LOCK_EX | File::LOCK_NB)
+          }
+        rescue Errno::ENOENT
+          false
         end
+      }
 
-        daemon.run
-      when 'stop'
-        stat_file = Daemon.new_status_file(stat_file_path)
-        stat_file.open{
-          stat_file.should_be_locked
-          pid = YAML.load(stat_file.read)['pid']
-          Process.kill(Daemon::STOP_SIGNAL, pid)
+      start_daemon = lambda{
+        Riser::Daemon.start_daemon(daemonize: svc_conf.daemonize?,
+                                   daemon_name: svc_conf.daemon_name,
+                                   daemon_debug: svc_conf.daemon_debug?,
+                                   status_file: svc_conf.status_file,
+                                   listen_address: proc{
+                                     # to reload on server restart
+                                     build.call.listen_address
+                                   },
+                                   server_polling_interval_seconds: svc_conf.server_polling_interval_seconds,
+                                   server_restart_overlap_seconds: svc_conf.server_restart_overlap_seconds,
+                                   server_privileged_user: svc_conf.server_privileged_user,
+                                   server_privileged_group: svc_conf.server_privileged_group
+                                  ) {|server|
+          c = build.call        # to reload on server restart
+          service = RIMS::Service.new(c)
+          service.setup(server, daemon: true)
         }
+      }
+
+      case (operation)
+      when 'start'
+        start_daemon.call
+      when 'stop'
+        if (status_file_locked.call) then
+          pid = YAML.load(IO.read(svc_conf.status_file))['pid']
+          Process.kill(Riser::Daemon::SIGNAL_STOP_GRACEFUL, pid)
+        else
+          abort('No daemon.')
+        end
       when 'restart'
-        stat_file = Daemon.new_status_file(stat_file_path)
-        stat_file.open{
-          stat_file.should_be_locked
-          pid = YAML.load(stat_file.read)['pid']
-          Process.kill(Daemon::RESTART_SIGNAL, pid)
-        }
+        if (status_file_locked.call) then
+          pid = YAML.load(IO.read(svc_conf.status_file))['pid']
+          Process.kill(Riser::Daemon::SIGNAL_RESTART_GRACEFUL, pid)
+        else
+          start_daemon.call
+        end
       when 'status'
-        stat_file = Daemon.new_status_file(stat_file_path)
-        stat_file.open{
-          if (stat_file.locked?) then
-            puts 'daemon is running.' if conf[:verbose]
-            return 0
-          else
-            puts 'daemon is stopped.' if conf[:verbose]
-            return 1
-          end
-        }
+        if (status_file_locked.call) then
+          puts 'daemon is running.' if conf[:verbose]
+          return 0 if conf[:use_status_code]
+        else
+          puts 'daemon is stopped.' if conf[:verbose]
+          return 1 if conf[:use_status_code]
+        end
       else
         raise "unknown daemon operation: #{operation}"
       end
@@ -513,7 +1080,7 @@ module RIMS
     def each_message(args, verbose: false)
       if (args.empty?) then
         msg_txt = STDIN.read
-        yield(msg_txt)
+        yield(msg_txt, nil)
         return 0
       else
         error_count = 0
@@ -521,14 +1088,16 @@ module RIMS
           puts "progress: #{i + 1}/#{args.length}" if verbose
           begin
             msg_txt = IO.read(filename, mode: 'rb', encoding: 'ascii-8bit')
-            yield(msg_txt)
+            yield(msg_txt, filename)
           rescue
             error_count += 1
             puts "failed to append message: #{filename}"
-            puts "error: #{$!}"
-            if ($DEBUG) then
-              for frame in $!.backtrace
-                puts frame
+            Error.trace_error_chain($!) do |exception|
+              puts "error: #{exception}"
+              if ($DEBUG) then
+                for frame in exception.backtrace
+                  puts frame
+                end
               end
             end
           end
@@ -568,8 +1137,8 @@ module RIMS
         unless (imap.capability.find{|c| c == 'X-RIMS-MAIL-DELIVERY-USER' }) then
           warn('warning: This IMAP server might not support RIMS mail delivery protocol.')
         end
-        each_message(args) do |msg_txt|
-          t = conf.look_for_date(msg_txt)
+        each_message(args) do |msg_txt, filename|
+          t = conf.look_for_date(msg_txt, filename)
           encoded_mbox_name = Protocol::Decoder.encode_delivery_target_mailbox(post_user, conf[:mailbox])
           imap_append(imap, encoded_mbox_name, msg_txt, store_flags: store_flags, date_time: t, verbose: conf[:verbose])
         end
@@ -596,8 +1165,8 @@ module RIMS
 
       store_flags = conf.make_imap_store_flags
       conf.imap_connect{|imap|
-        each_message(args) do |msg_txt|
-          t = conf.look_for_date(msg_txt)
+        each_message(args) do |msg_txt, filename|
+          t = conf.look_for_date(msg_txt, filename)
           imap_append(imap, conf[:mailbox], msg_txt, store_flags: store_flags, date_time: t, verbose: conf[:verbose])
         end
       }
@@ -610,7 +1179,7 @@ module RIMS
       ]
 
       conf = Config.new(options, option_list)
-      conf.load_library_option
+      conf.required_feature_option
       conf.key_value_store_option
       conf.help_option(add_banner: ' [mailbox directory]')
       conf.quiet_option
@@ -650,7 +1219,7 @@ module RIMS
           0
         end
       ensure
-        Error.suppress_2nd_error_at_resource_closing{ meta_db.close }
+        meta_db.close
       end
     end
     command_function :cmd_mbox_dirty_flag, 'Show/enable/disable dirty flag of mailbox database.'
@@ -671,25 +1240,26 @@ module RIMS
     command_function :cmd_unique_user_id, 'Show unique user ID from username.'
 
     def cmd_show_user_mbox(options, args)
-      conf = RIMS::Config.new
-      load_server_config = false
+      svc_conf = RIMS::Service::Configuration.new
+      load_service_config = false
 
       options.banner += ' [base directory] [username] OR -f [config.yml path] [username]'
       options.on('-f', '--config-yaml=CONFIG_FILE',
+                 String,
                  'Load optional parameters from CONFIG_FILE.') do |path|
-        conf.load_config_yaml(path)
-        load_server_config = true
+        svc_conf.load_yaml(path)
+        load_service_config = true
       end
       options.parse!(args)
 
-      unless (load_server_config) then
+      unless (load_service_config) then
         base_dir = args.shift or raise 'need for base directory.'
-        conf.load(base_dir: base_dir)
+        svc_conf.load(base_dir: base_dir)
       end
 
       username = args.shift or raise 'need for a username.'
       unique_user_id = Authentication.unique_user_id(username)
-      puts conf.make_key_value_store_path_from_base_dir(MAILBOX_DATA_STRUCTURE_VERSION, unique_user_id)
+      puts svc_conf.make_key_value_store_path(MAILBOX_DATA_STRUCTURE_VERSION, unique_user_id)
 
       0
     end
@@ -697,7 +1267,7 @@ module RIMS
 
     def cmd_pass_hash(options, args)
       option_list = [
-        [ :hash_type, 'SHA256', '--hash-type=DIGEST', 'Password hash type (ex SHA256, MD5, etc). default is SHA256.' ],
+        [ :hash_type, 'SHA256', '--hash-type=DIGEST', String, 'Password hash type (ex SHA256, MD5, etc). default is SHA256.' ],
         [ :stretch_count, 10000, '--stretch-count=COUNT', Integer, 'Count to stretch password hash. default is 10000.' ],
         [ :salt_size, 16, '--salt-size=OCTETS', Integer, 'Size of salt string. default is 16 octets.' ]
       ]
@@ -724,9 +1294,9 @@ Options:
 
       case (args.length)
       when 0
-        passwd, *optional = YAML.load_stream(STDIN)
+        passwd, *_optional = YAML.load_stream(STDIN)
       when 1
-        passwd, *optional = File.open(args[0]) {|f| YAML.load_stream(f) }
+        passwd, *_optional = File.open(args[0]) {|f| YAML.load_stream(f) }
       else
         raise ArgumentError, 'too many input files.'
       end
@@ -754,7 +1324,7 @@ Options:
       ]
 
       conf = Config.new(options, option_list)
-      conf.load_library_option
+      conf.required_feature_option
       conf.key_value_store_option
       conf.help_option(add_banner: ' [DB_NAME]')
       conf.setup_option_list
@@ -794,7 +1364,7 @@ Options:
           puts entry
         end
       ensure
-        Error.suppress_2nd_error_at_resource_closing{ db.close }
+        db.close
       end
 
       0