X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2_config.h;h=9e8f13d26b5d283eb361167899e88c194a0d5457;hb=b9c889efbc310cfe669c497c8c5636ef9ad24934;hp=65ea5cc47cf2dd6f37b94a906ae4c791fc90e00e;hpb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 65ea5cc..9e8f13d 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -23,7 +23,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "normalize_cache.h"
 
 #include <yaz/nmem.h>
+#include <yaz/mutex.h>
 #include "charsets.h"
+#include "http.h"
+#include "database.h"
 
 enum conf_metadata_type {
     Metadata_type_generic,    // Generic text field
@@ -97,6 +100,7 @@ struct conf_server;
 // however, only a single service is possible.
 struct conf_service
 {
+    YAZ_MUTEX mutex;
     int num_metadata;
     struct conf_metadata *metadata;
     int num_sortkeys;
@@ -132,9 +136,8 @@ struct conf_server
     char *proxy_host;
     int proxy_port;
     char *myurl;
-    struct sockaddr_in *proxy_addr;
-    int listener_socket;
     char *server_settings;
+    char *server_id;
 
     pp2_charset_t relevance_pct;
     pp2_charset_t sort_pct;
@@ -142,6 +145,9 @@ struct conf_server
     struct conf_service *service;
     struct conf_server *next;
     struct conf_config *config;
+    http_server_t http_server;
+    iochan_man_t iochan_man;
+    database_hosts_t database_hosts;
 };
 
 struct conf_targetprofiles
@@ -154,7 +160,7 @@ struct conf_targetprofiles
 
 struct conf_config *config_create(const char *fname, int verbose);
 void config_destroy(struct conf_config *config);
-void config_start_databases(struct conf_config *config);
+void config_process_events(struct conf_config *config);
 
 struct conf_service *locate_service(struct conf_server *server,
                                     const char *service_id);
@@ -169,7 +175,7 @@ int config_start_listeners(struct conf_config *conf,
 
 void config_stop_listeners(struct conf_config *conf);
 
-WRBUF conf_get_fname(struct conf_service *service, const char *fname);
+WRBUF conf_get_fname(struct conf_config *config, const char *fname);
 
 #endif