Refactor service, settings

[pazpar2-moved-to-github.git] / src / pazpar2.c

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 671558c..ae091cc 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -36,13 +36,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void child_handler(void *data)
 {
+    struct conf_service *service = global_parameters.server->service;
     start_proxy();
-    init_settings();
+
+    init_settings(service);
 
     if (*global_parameters.settings_path_override)
-        settings_read(global_parameters.settings_path_override);
+        settings_read(service, global_parameters.settings_path_override);
     else if (global_parameters.server->settings)
-        settings_read(global_parameters.server->settings);
+        settings_read(service, global_parameters.server->settings);
     else
         yaz_log(YLOG_WARN, "No settings-directory specified");
     global_parameters.odr_in = odr_createmem(ODR_DECODE);
@@ -50,7 +52,6 @@ void child_handler(void *data)
 
 
     pazpar2_event_loop();
-
 }
 
 static void show_version(void)
@@ -98,7 +99,7 @@ static int sc_main(
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
-    int session_timeout = 60; // session timeout
+    int session_timeout = 60;
 
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
@@ -139,11 +140,13 @@ static int sc_main(
             break;
         case 'T':
            session_timeout = atoi(arg);
-           if (session_timeout >= 10 && session_timeout <= 86400) {
-               global_parameters.session_timeout = session_timeout;
-           } else {
-               fprintf(stderr, "Session timeout out of range 10..86400: %d\n", session_timeout);
+           if (session_timeout < 9 || session_timeout > 86400)
+            {
+                yaz_log(YLOG_FATAL, "Session timeout out of range 10..86400: %d",
+                        session_timeout);
+                return 1;
             }
+            global_parameters.session_timeout = session_timeout;
             break;
         case 'u':
             uid = arg;