/* This file is part of Pazpar2.
- Copyright (C) 2006-2013 Index Data
+ Copyright (C) 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
{
struct mallinfo minfo;
minfo = mallinfo();
- wrbuf_printf(wrbuf, " <memory>\n"
- " <arena>%d</arena>\n"
- " <uordblks>%d</uordblks>\n"
- " <fordblks>%d</fordblks>\n"
- " <ordblks>%d</ordblks>\n"
- " <keepcost>%d</keepcost>\n"
- " <hblks>%d</hblks>\n"
- " <hblkhd>%d</hblkhd>\n"
- " <virt>%d</virt>\n"
- " <virtuse>%d</virtuse>\n"
- " </memory>\n",
- minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
-
+ wrbuf_printf(wrbuf, " <memory>\n"
+ " <arena>%d</arena><!-- Non-mmapped space allocated (bytes) -->\n"
+ " <ordblks>%d</ordblks><!-- Number of free chunks -->\n"
+ " <smblks>%d</smblks><!-- Number of free fastbin blocks -->\n"
+ " <hblks>%d</hblks><!-- Number of mmapped regions -->\n"
+ " <hblkhd>%d</hblkhd><!-- Space allocated in mmapped regions (bytes) -->\n"
+ " <usmblks>%d</usmblks><!-- Maximum total allocated space (bytes) -->\n"
+ " <fsmblks>%d</fsmblks><!-- Space in freed fastbin blocks (bytes) -->\n"
+ " <uordblks>%d</uordblks><!-- Total allocated space (bytes) -->\n"
+ " <fordblks>%d</fordblks><!-- Total free space (bytes) -->\n"
+ " <keepcost>%d</keepcost><!-- Top-most, releasable space (bytes) -->\n"
+ " </memory>\n",
+ minfo.arena,
+ minfo.ordblks,
+ minfo.smblks,
+ minfo.hblks,
+ minfo.hblkhd,
+ minfo.usmblks,
+ minfo.fsmblks,
+ minfo.uordblks,
+ minfo.fordblks,
+ minfo.keepcost);
}
#else
#define print_meminfo(x)
g_http_sessions += delta;
sessions = g_http_sessions;
yaz_mutex_leave(g_http_session_mutex);
- yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions);
+ yaz_log(YLOG_DEBUG, "%s http_sessions=%d", delta == 0 ? "" :
+ (delta > 0 ? "INC" : "DEC"), sessions);
return sessions;
}
hs->session_list = 0;
hs->mutex = 0;
pazpar2_mutex_create(&hs->mutex, "http_sessions");
- hs->log_level = yaz_log_module_level("HTTP");
+ hs->log_level = yaz_log_module_level("http");
return hs;
}
char tmp_str[50];
sprintf(tmp_str, "session#%u", sesid);
- r->psession = new_session(nmem, service, sesid);
+ r->psession = session_create(nmem, service, sesid);
r->session_id = sesid;
r->timestamp = 0;
r->nmem = nmem;
r->timeout_iochan, service->session_timeout);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
- iochan_add(service->server->iochan_man, r->timeout_iochan);
+ iochan_add(service->server->iochan_man, r->timeout_iochan, -1);
http_session_use(1);
return r;
}
return "No error";
}
-static void error(struct http_response *rs,
- enum pazpar2_error_code code,
- const char *addinfo)
+static void error2(struct http_response *rs,
+ enum pazpar2_error_code code,
+ const char *addinfo, const char *addinfo2)
{
struct http_channel *c = rs->channel;
WRBUF text = wrbuf_alloc();
rs->msg = nmem_strdup(c->nmem, msg);
strcpy(rs->code, http_status);
- wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX "<error code=\"%d\" msg=\"%s\">", (int) code,
- msg);
+ wrbuf_printf(text, HTTP_COMMAND_RESPONSE_PREFIX
+ "<error code=\"%d\" msg=\"%s\">", (int) code, msg);
if (addinfo)
+ {
wrbuf_xmlputs(text, addinfo);
+ if (addinfo2)
+ {
+ wrbuf_xmlputs(text, ": ");
+ wrbuf_xmlputs(text, addinfo2);
+ }
+ }
wrbuf_puts(text, "</error>");
yaz_log(YLOG_WARN, "HTTP %s %s%s%s", http_status,
http_send_response(c);
}
-static void response_open_no_status(struct http_channel *c, const char *command)
+static void error(struct http_response *rs,
+ enum pazpar2_error_code code,
+ const char *addinfo)
+{
+ error2(rs, code, addinfo, 0);
+}
+
+static void response_open_command(struct http_channel *c, const char *command)
{
wrbuf_rewind(c->wrbuf);
- wrbuf_printf(c->wrbuf, "%s<%s>",
- HTTP_COMMAND_RESPONSE_PREFIX, command);
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX);
+ if (command)
+ wrbuf_printf(c->wrbuf, "<%s>", command);
}
-static void response_open(struct http_channel *c, const char *command)
+static void response_open_ok(struct http_channel *c, const char *command)
{
- response_open_no_status(c, command);
+ response_open_command(c, command);
wrbuf_puts(c->wrbuf, "<status>OK</status>");
}
{
struct http_response *rs = c->response;
- wrbuf_printf(c->wrbuf, "</%s>", command);
+ if (command)
+ wrbuf_printf(c->wrbuf, "</%s>", command);
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
struct http_response *rs)
{
struct http_argument *a;
+ NMEM nmem = nmem_create();
for (a = rq->arguments; a; a = a->next)
if (strchr(a->name, '['))
char *setting;
// Nmem_strsplit *rules*!!!
- nmem_strsplit(se->session_nmem, "[]", a->name, &res, &num);
+ nmem_strsplit(nmem, "[]", a->name, &res, &num);
if (num != 2)
{
error(rs, PAZPAR2_MALFORMED_SETTING, a->name);
+ nmem_destroy(nmem);
return -1;
}
setting = res[0];
dbname = res[1];
- session_apply_setting(se, dbname, setting,
- nmem_strdup(se->session_nmem, a->value));
+ session_apply_setting(se, dbname, setting, a->value);
}
+ nmem_destroy(nmem);
return 0;
}
{
yaz_log(YLOG_WARN, "exit");
- response_open(c, "exit");
+ response_open_ok(c, "exit");
response_close(c, "exit");
if (global_parameters.debug_mode)
http_close_server(c->server);
if (process_settings(s->psession, c->request, c->response) < 0)
return;
- response_open(c, "init");
+ response_open_ok(c, "init");
wrbuf_printf(c->wrbuf, "<session>%d", sesid);
if (c->server->server_id)
{
wrbuf_puts(c->wrbuf, "</session>"
"<protocol>" PAZPAR2_PROTOCOL_VERSION "</protocol>");
- wrbuf_printf(c->wrbuf, "<keepAlive>%d</keepAlive>\n", 1000 * ((s->psession->service->session_timeout >= 20) ?
- (s->psession->service->session_timeout - 10) : 50));
+ wrbuf_printf(c->wrbuf, "<keepAlive>%d</keepAlive>\n",
+ 1000 * ((s->psession->service->session_timeout >= 20) ?
+ (s->psession->service->session_timeout - 10) : 50));
response_close(c, "init");
}
{
struct session *se = (struct session *) client_data;
- session_apply_setting(se, nmem_strdup(se->session_nmem, set->target),
- nmem_strdup(se->session_nmem, set->name),
- nmem_strdup(se->session_nmem, set->value));
+ session_apply_setting(se, set->target, set->name, set->value);
}
static void cmd_settings(struct http_channel *c)
if (!doc)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
- release_session(c,s);
+ release_session(c, s);
return;
}
root_n = xmlDocGetRootElement(doc);
if (ret)
{
error(rs, PAZPAR2_MALFORMED_SETTING, 0);
- release_session(c,s);
+ release_session(c, s);
return;
}
}
release_session(c, s);
return;
}
- response_open(c, "settings");
+ response_open_ok(c, "settings");
response_close(c, "settings");
release_session(c, s);
}
-static void termlist_response(struct http_channel *c, struct http_session *s, const char *cmd_status)
+static void termlist_response(struct http_channel *c, struct http_session *s,
+ const char *cmd_status)
{
struct http_request *rq = c->request;
const char *name = http_argbyname(rq, "name");
status = session_active_clients(s->psession);
- response_open_no_status(c, "termlist");
+ response_open_command(c, "termlist");
/* new protocol add a status to response. Triggered by a status parameter */
if (cmd_status != 0)
wrbuf_printf(c->wrbuf, "<status>%s</status>\n", cmd_status);
session_log(s->psession, c->http_sessions->log_level,
"termlist watch released");
termlist_response(c, s, status);
- release_session(c,s);
+ release_session(c, s);
}
}
static void session_status(struct http_channel *c, struct http_session *s)
{
size_t session_nmem;
- wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n", s->activity_counter);
- wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n", nmem_total(s->nmem) );
+ wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n",
+ s->activity_counter);
+ wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n",
+ nmem_total(s->nmem) );
session_nmem = session_get_memory_status(s->psession);
wrbuf_printf(c->wrbuf, "<session_nmem>%zu</session_nmem>\n", session_nmem);
}
-static void cmd_session_status(struct http_channel *c)
+static void cmd_service(struct http_channel *c)
{
struct http_session *s = locate_session(c);
if (!s)
return;
- response_open(c, "session-status");
- session_status(c, s);
- response_close(c, "session-status");
+ response_open_command(c, 0);
+ if (s->psession->service->xml_node)
+ wrbuf_puts(c->wrbuf, s->psession->service->xml_node);
+ response_close(c, 0);
release_session(c, s);
}
-int sessions_count(void);
-int clients_count(void);
-#ifdef HAVE_RESULTSETS_COUNT
-int resultsets_count(void);
-#else
-#define resultsets_count() 0
-#endif
-
-static void cmd_server_status(struct http_channel *c)
+static void cmd_session_status(struct http_channel *c)
{
- int sessions = sessions_count();
- int clients = clients_count();
- int resultsets = resultsets_count();
-
- response_open(c, "server-status");
- wrbuf_printf(c->wrbuf, "\n <sessions>%u</sessions>\n", sessions);
- wrbuf_printf(c->wrbuf, " <clients>%u</clients>\n", clients);
- /* Only works if yaz has been compiled with enabling of this */
- wrbuf_printf(c->wrbuf, " <resultsets>%u</resultsets>\n",resultsets);
- print_meminfo(c->wrbuf);
+ struct http_session *s = locate_session(c);
+ if (!s)
+ return;
-/* TODO add all sessions status */
-/* http_sessions_t http_sessions = c->http_sessions; */
-/* struct http_session *p; */
-/*
- yaz_mutex_enter(http_sessions->mutex);
- for (p = http_sessions->session_list; p; p = p->next)
- {
- p->activity_counter++;
- wrbuf_puts(c->wrbuf, "<session-status>\n");
- wrbuf_printf(c->wrbuf, "<id>%s</id>\n", p->session_id);
- yaz_mutex_leave(http_sessions->mutex);
- session_status(c, p);
- wrbuf_puts(c->wrbuf, "</session-status>\n");
- yaz_mutex_enter(http_sessions->mutex);
- p->activity_counter--;
- }
- yaz_mutex_leave(http_sessions->mutex);
-*/
- response_close(c, "server-status");
- xmalloc_trav(0);
+ response_open_ok(c, "session-status");
+ session_status(c, s);
+ response_close(c, "session-status");
+ release_session(c, s);
}
-static void bytarget_response(struct http_channel *c, struct http_session *s, const char *cmd_status) {
+static void bytarget_response(struct http_channel *c, struct http_session *s,
+ const char *cmd_status)
+{
int count, i;
- struct hitsbytarget *ht;
struct http_request *rq = c->request;
const char *settings = http_argbyname(rq, "settings");
int version = get_version(rq);
- ht = get_hitsbytarget(s->psession, &count, c->nmem);
+ struct hitsbytarget *ht = get_hitsbytarget(s->psession, &count, c->nmem);
+
if (!cmd_status)
/* Old protocol, always ok */
- response_open(c, "bytarget");
- else {
+ response_open_ok(c, "bytarget");
+ else
+ {
/* New protocol, OK or WARNING (...)*/
- response_open_no_status(c, "bytarget");
+ response_open_command(c, "bytarget");
wrbuf_printf(c->wrbuf, "<status>%s</status>", cmd_status);
}
}
wrbuf_printf(c->wrbuf, "<hits>" ODR_INT_PRINTF "</hits>\n", ht[i].hits);
- wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n", ht[i].diagnostic);
+ wrbuf_printf(c->wrbuf, "<diagnostic>%d</diagnostic>\n",
+ ht[i].diagnostic);
if (ht[i].diagnostic)
{
wrbuf_puts(c->wrbuf, "<message>");
wrbuf_puts(c->wrbuf, "</addinfo>\n");
}
- wrbuf_printf(c->wrbuf, "<records>%d</records>\n", ht[i].records - ht[i].filtered);
- if (version >= 2) {
- wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
- wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", ht[i].approximation);
+ wrbuf_printf(c->wrbuf, "<records>%d</records>\n",
+ ht[i].records - ht[i].filtered);
+ wrbuf_printf(c->wrbuf, "<filtered>%d</filtered>\n", ht[i].filtered);
+ if (version >= 2)
+ {
+ wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+ "</approximation>\n", ht[i].approximation);
}
wrbuf_puts(c->wrbuf, "<state>");
wrbuf_xmlputs(c->wrbuf, ht[i].state);
wrbuf_puts(c->wrbuf, ht[i].settings_xml);
wrbuf_puts(c->wrbuf, "</settings>\n");
}
- if (ht[i].suggestions_xml && ht[i].suggestions_xml[0]) {
+ if (ht[i].suggestions_xml && ht[i].suggestions_xml[0])
+ {
wrbuf_puts(c->wrbuf, "<suggestions>");
wrbuf_puts(c->wrbuf, ht[i].suggestions_xml);
wrbuf_puts(c->wrbuf, "</suggestions>");
}
+ if (ht[i].query_data)
+ {
+ wrbuf_puts(c->wrbuf, "<query_type>");
+ wrbuf_xmlputs(c->wrbuf, ht[i].query_type);
+ wrbuf_puts(c->wrbuf, "</query_type>\n");
+ wrbuf_puts(c->wrbuf, "<query_data>");
+ wrbuf_xmlputs(c->wrbuf, ht[i].query_data);
+ wrbuf_puts(c->wrbuf, "</query_data>\n");
+ }
wrbuf_puts(c->wrbuf, "</target>");
}
response_close(c, "bytarget");
}
else if (report_status)
status_message = "WARNING (Already blocked on bytarget)";
- else {
+ else
session_log(s->psession, YLOG_WARN, "Ignoring bytarget block."
" Return current result.");
- }
}
else
{
}
static void write_metadata(WRBUF w, struct conf_service *service,
- struct record_metadata **ml, int full, int indent)
+ struct record_metadata **ml, unsigned flags,
+ int indent)
{
int imeta;
{
struct conf_metadata *cmd = &service->metadata[imeta];
struct record_metadata *md;
- if (!cmd->brief && !full)
+ if (!cmd->brief && !(flags & 1))
continue;
for (md = ml[imeta]; md; md = md->next)
{
switch (cmd->type)
{
case Metadata_type_generic:
- wrbuf_xmlputs(w, md->data.text.disp);
+ if (md->data.text.snippet && (flags & 2))
+ wrbuf_puts(w, md->data.text.snippet);
+ else
+ wrbuf_xmlputs(w, md->data.text.disp);
break;
case Metadata_type_year:
wrbuf_printf(w, "%d", md->data.number.min);
if (md->data.number.min != md->data.number.max)
wrbuf_printf(w, "-%d", md->data.number.max);
break;
+ case Metadata_type_float:
+ wrbuf_printf(w, "%f", md->data.fnumber);
+ break;
default:
wrbuf_puts(w, "[can't represent]");
break;
}
static void write_subrecord(struct record *r, WRBUF w,
- struct conf_service *service, int show_details)
+ struct conf_service *service, unsigned flags,
+ int indent)
{
const char *name = session_setting_oneval(
client_get_database(r->client), PZ_NAME);
wrbuf_printf(w, "%u", r->checksum);
wrbuf_puts(w, "\">\n");
- write_metadata(w, service, r->metadata, show_details, 2);
+ write_metadata(w, service, r->metadata, flags, indent);
wrbuf_puts(w, " </location>\n");
}
const char *offsetstr = http_argbyname(rq, "offset");
const char *binarystr = http_argbyname(rq, "binary");
const char *checksumstr = http_argbyname(rq, "checksum");
+ const char *snippets = http_argbyname(rq, "snippets");
+ unsigned flags = (snippets && *snippets == '1') ? 3 : 1;
if (!s)
return;
if (checksumstr)
{
- long v = atol(checksumstr);
+ unsigned v = strtoul(checksumstr, 0, 10);
for (i = 0; r; r = r->next)
if (v == r->checksum)
break;
else
{
struct record *r;
- response_open_no_status(c, "record");
+ response_open_command(c, "record");
wrbuf_puts(c->wrbuf, "\n <recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "</recid>\n");
}
wrbuf_printf(c->wrbuf, " <activeclients>%d</activeclients>\n",
session_active_clients(s->psession));
- write_metadata(c->wrbuf, service, rec->metadata, 1, 1);
+ write_metadata(c->wrbuf, service, rec->metadata, flags, 1);
for (r = rec->records; r; r = r->next)
- write_subrecord(r, c->wrbuf, service, 2);
+ write_subrecord(r, c->wrbuf, service, flags, 2);
response_close(c, "record");
}
show_single_stop(s->psession, rec);
session_log(s->psession, c->http_sessions->log_level,
"record watch released");
show_record(c, s);
- release_session(c,s);
+ release_session(c, s);
}
}
static void cmd_record(struct http_channel *c)
{
struct http_session *s = locate_session(c);
- if (s) {
+ if (s)
+ {
show_record(c, s);
- release_session(c,s);
+ release_session(c, s);
}
}
-static void show_records(struct http_channel *c, struct http_session *s, int active)
+static void show_records(struct http_channel *c, struct http_session *s,
+ int active)
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
const char *num = http_argbyname(rq, "num");
const char *sort = http_argbyname(rq, "sort");
int version = get_version(rq);
+ const char *snippets = http_argbyname(rq, "snippets");
+ unsigned flags = (snippets && *snippets == '1') ? 2 : 0;
int startn = 0;
int numn = 20;
numn = atoi(num);
service = s->psession->service;
- if (!sort) {
+ if (!sort)
sort = service->default_sort;
- }
if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
{
error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
if (!rl)
return;
- response_open(c, "show");
+ response_open_ok(c, "show");
wrbuf_printf(c->wrbuf, "\n<activeclients>%d</activeclients>\n", active);
wrbuf_printf(c->wrbuf, "<merged>%d</merged>\n", total);
wrbuf_printf(c->wrbuf, "<total>" ODR_INT_PRINTF "</total>\n", total_hits);
- if (version >= 2) {
- wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF "</approximation>\n", approx_hits);
- }
+ if (version >= 2)
+ wrbuf_printf(c->wrbuf, "<approximation>" ODR_INT_PRINTF
+ "</approximation>\n", approx_hits);
+
wrbuf_printf(c->wrbuf, "<start>%d</start>\n", startn);
wrbuf_printf(c->wrbuf, "<num>%d</num>\n", numn);
struct conf_service *service = s->psession->service;
wrbuf_puts(c->wrbuf, "<hit>\n");
- write_metadata(c->wrbuf, service, rec->metadata, 0, 1);
+ write_metadata(c->wrbuf, service, rec->metadata, flags, 1);
for (ccount = 0, p = rl[i]->records; p; p = p->next, ccount++)
- write_subrecord(p, c->wrbuf, service, 0); // subrecs w/o details
+ write_subrecord(p, c->wrbuf, service, flags, 2);
wrbuf_printf(c->wrbuf, " <count>%d</count>\n", ccount);
if (strstr(sort, "relevance"))
{
else {
/* some error message */
}
- release_session(c,s);
+ release_session(c, s);
}
static void cmd_show(struct http_channel *c)
const char *block = http_argbyname(rq, "block");
const char *sort = http_argbyname(rq, "sort");
const char *block_error = http_argbyname(rq, "report");
+ const char *mergekey = http_argbyname(rq, "mergekey");
+ const char *rank = http_argbyname(rq, "rank");
struct conf_service *service = 0;
-
struct reclist_sortparms *sp;
int status;
int report_error = 0;
- if (block_error && !strcmp("1", block_error)) {
+
+ if (block_error && !strcmp("1", block_error))
report_error = 1;
- }
if (!s)
return;
-
service = s->psession->service;
- if (!sort) {
+ if (!sort)
sort = service->default_sort;
- }
-
if (!(sp = reclist_parse_sortparms(c->nmem, sort, service)))
{
error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
release_session(c, s);
return;
}
- session_sort(s->psession, sp);
+ session_sort(s->psession, sp, mergekey, rank);
status = session_active_clients(s->psession);
- if (block)
+ if (block && reclist_get_num_records(s->psession->reclist) == 0)
{
- if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0)
+ if (!strcmp(block, "preferred")
+ && !session_is_preferred_clients_ready(s->psession)
+ && reclist_get_num_records(s->psession->reclist) == 0)
{
// if there is already a watch/block. we do not block this one
if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
struct http_session *s = locate_session(c);
if (!s)
return;
- response_open(c, "ping");
+ response_open_ok(c, "ping");
response_close(c, "ping");
release_session(c, s);
}
const char *startrecs = http_argbyname(rq, "startrecs");
const char *limit = http_argbyname(rq, "limit");
const char *sort = http_argbyname(rq, "sort");
+ const char *mergekey = http_argbyname(rq, "mergekey");
+ const char *rank = http_argbyname(rq, "rank");
enum pazpar2_error_code code;
const char *addinfo = 0;
+ const char *addinfo2 = 0;
struct reclist_sortparms *sp;
struct conf_service *service = 0;
return;
}
service = s->psession->service;
- if (!sort) {
+ if (!sort)
sort = service->default_sort;
- }
+
if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
{
error(c->response, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
}
code = session_search(s->psession, query, startrecs, maxrecs, filter, limit,
- &addinfo, sp);
+ &addinfo, &addinfo2, sp, mergekey, rank);
if (code)
{
- error(rs, code, addinfo);
+ error2(rs, code, addinfo, addinfo2);
release_session(c, s);
return;
}
- response_open(c, "search");
+ response_open_ok(c, "search");
response_close(c, "search");
release_session(c, s);
}
progress = (stat.num_clients - clients) / (float)stat.num_clients;
}
- response_open_no_status(c, "stat");
+ response_open_command(c, "stat");
wrbuf_printf(c->wrbuf, "\n <activeclients>%d</activeclients>\n", clients);
wrbuf_printf(c->wrbuf, " <hits>" ODR_INT_PRINTF "</hits>\n", stat.num_hits);
wrbuf_printf(c->wrbuf, " <records>%d</records>\n", stat.num_records);
release_session(c, s);
}
+static void cmd_stop(struct http_channel *c)
+{
+ struct http_session *s = locate_session(c);
+ if (!s)
+ return;
+ response_open_ok(c, "stop");
+ session_stop(s->psession);
+ response_close(c, "stop");
+ release_session(c, s);
+}
+
static void cmd_info(struct http_channel *c)
{
char yaz_version_str[20];
char yaz_sha1_str[42];
- response_open_no_status(c, "info");
+ response_open_command(c, "info");
wrbuf_puts(c->wrbuf, "\n <version>\n");
wrbuf_puts(c->wrbuf, " <pazpar2");
#ifdef PAZPAR2_VERSION_SHA1
}
}
#endif
+ wrbuf_printf(c->wrbuf, " <sessions>%d</sessions>\n", sessions_get_count());
+ wrbuf_printf(c->wrbuf, " <clients>%d</clients>\n", clients_get_count());
+ print_meminfo(c->wrbuf);
info_services(c->server, c->wrbuf);
response_close(c, "info");
{ "termlist", cmd_termlist },
{ "exit", cmd_exit },
{ "session-status", cmd_session_status },
- { "server-status", cmd_server_status },
+ { "service", cmd_service },
{ "ping", cmd_ping },
{ "record", cmd_record },
{ "info", cmd_info },
+ { "stop", cmd_stop },
{0,0}
};
projects / pazpar2-moved-to-github.git / blobdiff