X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=cb69a5e1ba8222f993566f46f14f93af7a3f99ef;hb=84a59bac11f3eece56bb0f4cf107dcd462798cea;hp=e7d583acc51e06bdde3972bb6c633e116927b728;hpb=354598df6b8d6fac5947d3d79e0532665fbe8a19;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index e7d583a..cb69a5e 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2009 Index Data
+   Copyright (C) 2006-2010 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -27,11 +27,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <signal.h>
 #include <assert.h>
 
-#include "pazpar2.h"
-#include "database.h"
-#include "settings.h"
+#include "parameters.h"
+#include "session.h"
+#include "ppmutex.h"
 #include <yaz/daemon.h>
-
+#include <yaz/log.h>
+#include <yaz/options.h>
 #include <yaz/sc.h>
 
 static struct conf_config *sc_stop_config = 0;
@@ -39,9 +40,10 @@ static struct conf_config *sc_stop_config = 0;
 void child_handler(void *data)
 {
     struct conf_config *config = (struct conf_config *) data;
-    config_read_settings(config);
 
-    pazpar2_event_loop();
+    config_process_events(config);
+
+    config_destroy(config);
 }
 
 static void show_version(void)
@@ -58,7 +60,9 @@ static void show_version(void)
 
     printf("Configuration:");
 #if YAZ_HAVE_ICU
-    printf(" icu:?");
+    printf(" icu:enabled");
+#else
+    printf(" icu:disabled");
 #endif
     printf(" yaz:%s", yaz_version_str);
     printf("\n");
@@ -89,7 +93,6 @@ static int sc_main(
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
-    int session_timeout = 60;
     const char *listener_override = 0;
     const char *config_fname = 0;
     struct conf_config *config = 0;
@@ -105,7 +108,7 @@ static int sc_main(
     yaz_log_init_prefix("pazpar2");
     yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:tT:u:VX", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:tu:v:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -131,23 +134,16 @@ static int sc_main(
         case 't':
             test_mode = 1;
             break;
-        case 'T':
-	    session_timeout = atoi(arg);
-	    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;
             break;
+        case 'v':
+            yaz_log_init_level(yaz_log_mask_str(arg));
+            break;
         case 'V':
             show_version();
         case 'X':
-            global_parameters.debug_mode = 1;
+            global_parameters.debug_mode++;
             break;
         default:
             fprintf(stderr, "Usage: pazpar2\n"
@@ -158,9 +154,9 @@ static int sc_main(
                     "    -l file                 Log to file\n"
                     "    -p pidfile              PID file\n"
                     "    -t                      Test configuration\n"
-                    "    -T session_timeout      Session timeout\n"
                     "    -u uid                  Change user to uid\n"
                     "    -V                      Show version\n"
+                    "    -v level                Set log level\n"
                     "    -X                      Debug mode\n"
 #ifdef WIN32
                     "    -install                Install windows service\n"
@@ -175,6 +171,8 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
         return 1;
     }
+    pazpar2_mutex_init();
+    
     config = config_create(config_fname, global_parameters.dump_records);
     if (!config)
         return 1;
@@ -186,7 +184,13 @@ static int sc_main(
     }
     else
     {
-        yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+        yaz_log(YLOG_LOG, "Pazpar2 " VERSION  " "
+#ifdef PAZPAR2_VERSION_SHA1
+                PAZPAR2_VERSION_SHA1
+#else
+                "-"
+#endif
+                " started");
         if (daemon && !log_file_in_use)
         {
             yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "