X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhttp_command.c;h=e8bba87fba3ed0e41fb0019ecd07486b3676fd6c;hb=09e752194178c47e62eb2cc45bdf58728a87ea54;hp=fbda4780a7f8e59b25bb5a8c46f940da9f7770aa;hpb=f60b9388134deef7df4d2315369dfdd505dc7f67;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index fbda478..e8bba87 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -587,22 +587,24 @@ static void cmd_termlist(struct http_channel *c)
size_t session_get_memory_status(struct session *session);
-static void cmd_session_status(struct http_channel *c)
+static void session_status(struct http_channel *c, struct http_session *s)
{
+ size_t session_nmem;
+ wrbuf_printf(c->wrbuf, "%u\n", s->activity_counter);
+ wrbuf_printf(c->wrbuf, "%zu\n", nmem_total(s->nmem) );
+ session_nmem = session_get_memory_status(s->psession);
+ wrbuf_printf(c->wrbuf, "%zu\n", session_nmem);
+}
+
+static void cmd_session_status(struct http_channel *c) {
struct http_response *rs = c->response;
struct http_session *s = locate_session(c);
- size_t session_nmem;
if (!s)
return;
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n");
- wrbuf_printf(c->wrbuf, "%u\n", s->activity_counter);
- wrbuf_printf(c->wrbuf, "%zu\n", nmem_total(s->nmem) );
-
- session_nmem = session_get_memory_status(s->psession);
- wrbuf_printf(c->wrbuf, "%zu\n", session_nmem);
-
+ session_status(c, s);
wrbuf_puts(c->wrbuf, "\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
@@ -612,7 +614,11 @@ static void cmd_session_status(struct http_channel *c)
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)
{
@@ -621,14 +627,36 @@ static void cmd_server_status(struct http_channel *c)
int clients = clients_count();
int resultsets = resultsets_count();
wrbuf_rewind(c->wrbuf);
- wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n");
- wrbuf_printf(c->wrbuf, "Sessions %u Clients: %u Resultsets: %u\n\n", sessions, clients, resultsets);
+ wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n");
+ wrbuf_printf(c->wrbuf, " %u\n", sessions);
+ wrbuf_printf(c->wrbuf, " %u\n", clients);
+ /* Only works if yaz has been compiled with enabling of this */
+ wrbuf_printf(c->wrbuf, " %u\n",resultsets);
+
+/* 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, "\n");
+ wrbuf_printf(c->wrbuf, "%s\n", p->session_id);
+ yaz_mutex_leave(http_sessions->mutex);
+ session_status(c, p);
+ wrbuf_puts(c->wrbuf, "\n");
+ yaz_mutex_enter(http_sessions->mutex);
+ p->activity_counter--;
+ }
+ yaz_mutex_leave(http_sessions->mutex);
+*/
+ wrbuf_puts(c->wrbuf, "\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
+ xmalloc_trav(0);
}
-
static void cmd_bytarget(struct http_channel *c)
{
struct http_response *rs = c->response;
@@ -1147,7 +1175,7 @@ static void cmd_info(struct http_channel *c)
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n");
wrbuf_puts(c->wrbuf, " \n");
- wrbuf_puts(c->wrbuf, "wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
#endif
@@ -1165,6 +1193,8 @@ static void cmd_info(struct http_channel *c)
wrbuf_puts(c->wrbuf, " \n");
+ info_services(c->server, c->wrbuf);
+
wrbuf_puts(c->wrbuf, "");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
@@ -1182,8 +1212,8 @@ struct {
{ "search", cmd_search },
{ "termlist", cmd_termlist },
{ "exit", cmd_exit },
- { "sessionstatus", cmd_session_status },
- { "serverstatus", cmd_server_status },
+ { "session-status", cmd_session_status },
+ { "server-status", cmd_server_status },
{ "ping", cmd_ping },
{ "record", cmd_record },
{ "info", cmd_info },