projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove two YLOG_DEBUG logs
[pazpar2-moved-to-github.git]
/
src
/
pazpar2_config.h
diff --git
a/src/pazpar2_config.h
b/src/pazpar2_config.h
index
65ea5cc
..
678e2e9
100644
(file)
--- 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 "normalize_cache.h"
#include <yaz/nmem.h>
+#include <yaz/mutex.h>
#include "charsets.h"
#include "charsets.h"
+#include "http.h"
+#include "database.h"
enum conf_metadata_type {
Metadata_type_generic, // Generic text field
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
{
// however, only a single service is possible.
struct conf_service
{
+ YAZ_MUTEX mutex;
int num_metadata;
struct conf_metadata *metadata;
int num_sortkeys;
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;
char *proxy_host;
int proxy_port;
char *myurl;
- struct sockaddr_in *proxy_addr;
- int listener_socket;
char *server_settings;
char *server_settings;
+ char *server_id;
pp2_charset_t relevance_pct;
pp2_charset_t sort_pct;
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;
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
};
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);
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);
struct conf_service *locate_service(struct conf_server *server,
const char *service_id);