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
Indented.
[pazpar2-moved-to-github.git]
/
src
/
http_command.c
diff --git
a/src/http_command.c
b/src/http_command.c
index
3d4df77
..
b191628
100644
(file)
--- a/
src/http_command.c
+++ b/
src/http_command.c
@@
-33,6
+33,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
+#include "ppmutex.h"
#include "eventl.h"
#include "parameters.h"
#include "session.h"
#include "eventl.h"
#include "parameters.h"
#include "session.h"
@@
-67,7
+68,7
@@
http_sessions_t http_sessions_create(void)
http_sessions_t hs = xmalloc(sizeof(*hs));
hs->session_list = 0;
hs->mutex = 0;
http_sessions_t hs = xmalloc(sizeof(*hs));
hs->session_list = 0;
hs->mutex = 0;
- yaz_mutex_create(&hs->mutex);
+ pazpar2_mutex_create(&hs->mutex, "http_sessions");
return hs;
}
return hs;
}
@@
-98,13
+99,16
@@
static void session_timeout(IOCHAN i, int event)
}
struct http_session *http_session_create(struct conf_service *service,
}
struct http_session *http_session_create(struct conf_service *service,
- http_sessions_t http_sessions)
+ http_sessions_t http_sessions,
+ unsigned int sesid)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
+ char tmp_str[50];
- r->psession = new_session(nmem, service);
- r->session_id = 0;
+ sprintf(tmp_str, "session#%u", sesid);
+ r->psession = new_session(nmem, service, tmp_str);
+ r->session_id = sesid;
r->timestamp = 0;
r->nmem = nmem;
r->destroy_counter = r->activity_counter = 0;
r->timestamp = 0;
r->nmem = nmem;
r->destroy_counter = r->activity_counter = 0;
@@
-117,7
+121,7
@@
struct http_session *http_session_create(struct conf_service *service,
r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
iochan_setdata(r->timeout_iochan, r);
r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
iochan_setdata(r->timeout_iochan, r);
- yaz_log(YLOG_LOG, "timeout=%d", service->session_timeout);
+ yaz_log(YLOG_LOG, "%p HTTP session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
iochan_add(service->server->iochan_man, r->timeout_iochan);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
iochan_add(service->server->iochan_man, r->timeout_iochan);
@@
-130,7
+134,7
@@
void http_session_destroy(struct http_session *s)
http_sessions_t http_sessions = s->http_sessions;
http_sessions_t http_sessions = s->http_sessions;
- yaz_log(YLOG_LOG, "http_session_destroy %u", s->session_id);
+ yaz_log(YLOG_LOG, "%p HTTP session destroy %u", s, s->session_id);
yaz_mutex_enter(http_sessions->mutex);
/* only if http_session destroy was already called, we will allow it
yaz_mutex_enter(http_sessions->mutex);
/* only if http_session destroy was already called, we will allow it
@@
-138,11
+142,6
@@
void http_session_destroy(struct http_session *s)
if (s->destroy_counter != s->activity_counter)
must_destroy = 0;
if (s->destroy_counter != s->activity_counter)
must_destroy = 0;
- /* only if there are no active Z39.50 clients we will allow it to be
- destroyed */
- if (session_active_clients(s->psession))
- must_destroy = 0;
-
s->destroy_counter = s->activity_counter = 0;
if (must_destroy)
{
s->destroy_counter = s->activity_counter = 0;
if (must_destroy)
{
@@
-157,11
+156,14
@@
void http_session_destroy(struct http_session *s)
yaz_mutex_leave(http_sessions->mutex);
if (must_destroy)
{ /* destroying for real */
yaz_mutex_leave(http_sessions->mutex);
if (must_destroy)
{ /* destroying for real */
- yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
- iochan_destroy(s->timeout_iochan);
+ yaz_log(YLOG_LOG, "%p HTTP session destroying. session id %u", s, s->session_id); iochan_destroy(s->timeout_iochan);
destroy_session(s->psession);
nmem_destroy(s->nmem);
}
destroy_session(s->psession);
nmem_destroy(s->nmem);
}
+ else {
+ yaz_log(YLOG_DEBUG, "%p HTTP Session. Active clients on session %u. Waiting for new timeout.", s, s->session_id);
+ }
+
}
static const char *get_msg(enum pazpar2_error_code code)
}
static const char *get_msg(enum pazpar2_error_code code)
@@
-356,7
+358,8
@@
static void cmd_init(struct http_channel *c)
return;
}
}
return;
}
}
- s = http_session_create(service, c->http_sessions);
+ sesid = make_sessionid();
+ s = http_session_create(service, c->http_sessions, sesid);
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
@@
-364,13
+367,11
@@
static void cmd_init(struct http_channel *c)
else
yaz_log(YLOG_LOG, "No databases preloaded");
else
yaz_log(YLOG_LOG, "No databases preloaded");
- sesid = make_sessionid();
- s->session_id = sesid;
if (process_settings(s->psession, c->request, c->response) < 0)
return;
sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX
if (process_settings(s->psession, c->request, c->response) < 0)
return;
sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX
- "<init><status>OK</status><session>%u", sesid);
+ "<init><status>OK</status><session>%d", sesid);
if (c->server->server_id)
{
strcat(buf, ".");
if (c->server->server_id)
{
strcat(buf, ".");