X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=8e489d4937bd79ca9c9012f546a8e61d55531668;hb=efcd52e23097c5fa48a5c6eacd3e1f6edc0e8e32;hp=70bf5d5b62d0d71e07e3a8c8892d7ad56f532106;hpb=7b4417cdb8241d4502f531dadc0aa23f0cc46606;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 70bf5d5..8e489d4 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,4 +1,4 @@ -/* $Id: zserver.c,v 1.93 2002-09-06 10:28:02 adam Exp $ +/* $Id: zserver.c,v 1.96 2002-09-09 09:35:17 adam Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -74,7 +74,7 @@ bend_initresult *bend_init (bend_initrequest *q) sob = statserv_getcontrol (); if (!(zh = zebra_open (sob->handle))) { - yaz_log (LOG_WARN, "Failed to open config `%s'", sob->configname); + yaz_log (LOG_WARN, "Failed to read config `%s'", sob->configname); r->errcode = 1; return r; } @@ -674,6 +674,11 @@ static void bend_start (struct statserv_options_block *sob) if (sob->handle) zebra_stop((ZebraService) sob->handle); sob->handle = zebra_start(sob->configname); + if (!sob->handle) + { + yaz_log (LOG_FATAL, "Failed to read config `%s'", sob->configname); + exit (1); + } } static void bend_stop(struct statserv_options_block *sob) @@ -699,7 +704,9 @@ int main (int argc, char **argv) strcpy (sob->configname, "zebra.cfg"); sob->bend_start = bend_start; sob->bend_stop = bend_stop; - +#ifdef WIN32 + strcpy (sob->service_display_name, "Zebra Server"); +#endif statserv_setcontrol (sob); return statserv_main (argc, argv, bend_init, bend_close);