From new_protocol branch.

1 files changed, 58 insertions, 4 deletions

diff --git a/server/src/configurationparser.cc b/server/src/configurationparser.cc
index 8247a45..bc10e2b 100644
--- a/server/src/configurationparser.cc
+++ b/server/src/configurationparser.cc
@@ -93,14 +93,26 @@ void ConfigurationParser::reload()
   }
 
   try {
-    std::string a = lookup("pentominos_addr");
-    Conf::pentominos_addr = a;
+    std::string s = lookup("artefact_addr");
+    Conf::artefact_addr = s;
   } catch( ... ) {
   }
 
   try {
-    int p = lookup("pentominos_port");
-    Conf::pentominos_port = p;
+    int i = lookup("artefact_port");
+    Conf::artefact_port = i;
+  } catch( ... ) {
+  }
+
+  try {
+    bool b = lookup("artefact_use_ssl");
+    Conf::artefact_use_ssl = b;
+  } catch( ... ) {
+  }
+
+  try {
+    int i = lookup("artefact_poolsize");
+    Conf::artefact_poolsize = i;
   } catch( ... ) {
   }
 
@@ -129,10 +141,52 @@ void ConfigurationParser::reload()
   }
 
   try {
+    int i = lookup("database_poolsize");
+    Conf::database_poolsize = i;
+  } catch( ... ) {
+  }
+
+  try {
     std::string p = lookup("xml_basedir");
     Conf::xml_basedir = p;
   } catch( ... ) {
   }
+
+  try {
+    bool b = lookup("use_ssl");
+    Conf::use_ssl = b;
+  } catch( ... ) {
+  }
+
+  try {
+    std::string s = lookup("ssl_key");
+    Conf::ssl_key = s;
+  } catch( ... ) {
+  }
+
+  try {
+    std::string s = lookup("ssl_cert");
+    Conf::ssl_cert = s;
+  } catch( ... ) {
+  }
+
+  try {
+    int i = lookup("connection_limit");
+    Conf::connection_limit = i;
+  } catch( ... ) {
+  }
+
+  try {
+    int i = lookup("connection_timeout");
+    Conf::connection_timeout = i;
+  } catch( ... ) {
+  }
+
+  try {
+    std::string s = lookup("session_path");
+    Conf::session_path = s;
+  } catch( ... ) {
+  }
 }
 
 #ifdef TEST_CONFIGURATIONPARSER