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
Renamee clients_count to clients_get_count
[pazpar2-moved-to-github.git]
/
src
/
pazpar2.c
diff --git
a/src/pazpar2.c
b/src/pazpar2.c
index
478188c
..
0dced81
100644
(file)
--- a/
src/pazpar2.c
+++ b/
src/pazpar2.c
@@
-58,7
+58,7
@@
void child_handler(void *data)
static void show_version(void)
{
static void show_version(void)
{
- char yaz_version_str[80];
+ char yaz_version_str[20];
printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
printf("Pazpar2 " PACKAGE_VERSION
#ifdef PAZPAR2_VERSION_SHA1
" "
@@
-120,6
+120,7
@@
static int sc_main(
#endif
yaz_log_init_prefix("pazpar2");
#endif
yaz_log_init_prefix("pazpar2");
+ yaz_log_init_level(yaz_log_mask_str("post"));
yaz_log_xml_errors(0, YLOG_WARN);
yaz_enable_panic_backtrace(argv[0]);
yaz_log_xml_errors(0, YLOG_WARN);
yaz_enable_panic_backtrace(argv[0]);
@@
-151,7
+152,8
@@
static int sc_main(
pidfile = arg;
break;
case 'R':
pidfile = arg;
break;
case 'R':
- record_fname = arg;
+ if (strcmp(arg, "-"))
+ record_fname = arg;
global_parameters.predictable_sessions = 1;
break;
case 't':
global_parameters.predictable_sessions = 1;
break;
case 't':
@@
-214,17
+216,20
@@
static int sc_main(
}
pazpar2_mutex_init();
}
pazpar2_mutex_init();
- if (!test_mode)
{
{
- yaz_log(YLOG_LOG, "Pazpar2 start " VERSION " "
+ char yaz_version_str[20];
+ char yaz_sha1_str[41];
+ yaz_log(YLOG_LOG, "Pazpar2 %s " VERSION " "
#ifdef PAZPAR2_VERSION_SHA1
PAZPAR2_VERSION_SHA1
#else
"-"
#endif
#ifdef PAZPAR2_VERSION_SHA1
PAZPAR2_VERSION_SHA1
#else
"-"
#endif
- );
+ , test_mode ? "test" : "start");
+ yaz_version(yaz_version_str, yaz_sha1_str);
+ yaz_log(YLOG_LOG, "YAZ %s %s", yaz_version_str, yaz_sha1_str);
}
}
-
+
config = config_create(config_fname);
if (!config)
return 1;
config = config_create(config_fname);
if (!config)
return 1;