From 7b59a11480e1f01d6b707c6352b7c6905164d6b8 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 21 Jun 2013 23:17:46 +0900
Subject: [PATCH] shrpx: Create default SSL context once

---
 src/shrpx.cc        | 15 +++++++++++++++
 src/shrpx_config.cc | 13 -------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/shrpx.cc b/src/shrpx.cc
index 33744619..eccf8d62 100644
--- a/src/shrpx.cc
+++ b/src/shrpx.cc
@@ -897,6 +897,21 @@ int main(int argc, char **argv)
     }
   }
 
+  if(get_config()->cert_file && get_config()->private_key_file) {
+    mod_config()->default_ssl_ctx =
+      ssl::create_ssl_context(get_config()->private_key_file,
+                              get_config()->cert_file);
+    if(get_config()->cert_tree) {
+      if(ssl::cert_lookup_tree_add_cert_from_file(get_config()->cert_tree,
+                                                  get_config()->default_ssl_ctx,
+                                                  get_config()->cert_file)
+         == -1) {
+        LOG(FATAL) << "Failed to parse command-line argument.";
+        exit(EXIT_FAILURE);
+      }
+    }
+  }
+
   if(get_config()->backend_ipv4 && get_config()->backend_ipv6) {
     LOG(FATAL) << "--backend-ipv4 and --backend-ipv6 cannot be used at the "
                << "same time.";
diff --git a/src/shrpx_config.cc b/src/shrpx_config.cc
index d0078d56..628db47c 100644
--- a/src/shrpx_config.cc
+++ b/src/shrpx_config.cc
@@ -406,19 +406,6 @@ int parse_config(const char *opt, const char *optarg)
     LOG(ERROR) << "Unknown option: " << opt;
     return -1;
   }
-  if(get_config()->cert_file && get_config()->private_key_file) {
-    mod_config()->default_ssl_ctx =
-      ssl::create_ssl_context(get_config()->private_key_file,
-                              get_config()->cert_file);
-    if(get_config()->cert_tree) {
-      if(ssl::cert_lookup_tree_add_cert_from_file(get_config()->cert_tree,
-                                                  get_config()->default_ssl_ctx,
-                                                  get_config()->cert_file)
-         == -1) {
-        return -1;
-      }
-    }
-  }
   return 0;
 }