X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=cb69a5e1ba8222f993566f46f14f93af7a3f99ef;hb=28aa5f1d51289406432ce995f435a9977c10f744;hp=3a43ed5e7f9add10e0306cce0ed422b07f78202c;hpb=8e26c620fe9f4cd52e0dc3bec5964c89e9a1b2b6;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 3a43ed5..cb69a5e 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -28,7 +28,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <assert.h>
 
 #include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
+#include "ppmutex.h"
 #include <yaz/daemon.h>
 #include <yaz/log.h>
 #include <yaz/options.h>
@@ -40,9 +41,9 @@ void child_handler(void *data)
 {
     struct conf_config *config = (struct conf_config *) data;
 
-    config_start_databases(config);
+    config_process_events(config);
 
-    pazpar2_event_loop();
+    config_destroy(config);
 }
 
 static void show_version(void)
@@ -142,7 +143,7 @@ static int sc_main(
         case 'V':
             show_version();
         case 'X':
-            global_parameters.debug_mode = 1;
+            global_parameters.debug_mode++;
             break;
         default:
             fprintf(stderr, "Usage: pazpar2\n"
@@ -170,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;
@@ -194,7 +197,6 @@ static int sc_main(
                     "mode");
             return 1;
         }
-        pazpar2_chan_man_start();
         ret = config_start_listeners(config, listener_override);
         if (ret)
             return ret; /* error starting http listener */