From 0daeb98a8b0f92d6ed1f8040fc6876dd4cdae04c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 4 Nov 2011 13:55:14 +0100 Subject: [PATCH] Use session_log rather than yaz_log When displaying whether a client is newly created or reused. --- src/session.c | 4 ++-- test/test_http_67.res | 2 ++ test/test_http_68.res | 2 ++ test/test_http_69.res | 8 ++++++++ test/test_http_70.res | 2 ++ test/test_http_71.res | 9 +++++++++ test/test_http_72.res | 25 +++++++++++++++++++++++++ 7 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 test/test_http_67.res create mode 100644 test/test_http_68.res create mode 100644 test/test_http_69.res create mode 100644 test/test_http_70.res create mode 100644 test/test_http_71.res create mode 100644 test/test_http_72.res diff --git a/src/session.c b/src/session.c index 0006652..2bb1de2 100644 --- a/src/session.c +++ b/src/session.c @@ -751,7 +751,7 @@ enum pazpar2_error_code session_search(struct session *se, no_failed++; else if (parse_ret == 0) { - yaz_log(YLOG_LOG, "client NEW %s", client_get_id(cl)); + session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl)); no_working++; if (client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, @@ -761,7 +761,7 @@ enum pazpar2_error_code session_search(struct session *se, } else { - yaz_log(YLOG_LOG, "client REUSE %s", client_get_id(cl)); + session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl)); no_working++; if (client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, diff --git a/test/test_http_67.res b/test/test_http_67.res new file mode 100644 index 0000000..d486aeb --- /dev/null +++ b/test/test_http_67.res @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/test/test_http_68.res b/test/test_http_68.res new file mode 100644 index 0000000..e506085 --- /dev/null +++ b/test/test_http_68.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_69.res b/test/test_http_69.res new file mode 100644 index 0000000..5a1147b --- /dev/null +++ b/test/test_http_69.res @@ -0,0 +1,8 @@ + +OK +0 +0 +0 +0 +0 + \ No newline at end of file diff --git a/test/test_http_70.res b/test/test_http_70.res new file mode 100644 index 0000000..ab63fe6 --- /dev/null +++ b/test/test_http_70.res @@ -0,0 +1,2 @@ + +OK \ No newline at end of file diff --git a/test/test_http_71.res b/test/test_http_71.res new file mode 100644 index 0000000..b24d50f --- /dev/null +++ b/test/test_http_71.res @@ -0,0 +1,9 @@ + +OK +z3950.indexdata.com/marc +Index Data MARC test server +1 +0 +1 +Client_Idle + \ No newline at end of file diff --git a/test/test_http_72.res b/test/test_http_72.res new file mode 100644 index 0000000..ecb7374 --- /dev/null +++ b/test/test_http_72.res @@ -0,0 +1,25 @@ + +OK +0 +1 +1 +0 +1 + + +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +The religious teachers of Greece +1972 +Adam, James +Reprint of the 1909 ed., which was issued as the 1904-1906 Gifford lectures +Includes bibliographical references +XXXXXXXXXX +test-usersetting-2 data: + YYYYYYYYY +120000 +content: title the religious teachers of greece author adam james medium book + + \ No newline at end of file -- 1.7.10.4