X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=7214a50d5902b0884ec7a7aa503a30b75dea70ff;hb=c7972c35afac7ee98226dbaef1af53d014a367f5;hp=d1c53b3df0cc84fc81d7db25696c85227e981088;hpb=d3886454d7ba0cb1ce0d58055ccf3cd7ffd321ad;p=idzebra-moved-to-github.git

diff --git a/index/zserver.c b/index/zserver.c
index d1c53b3..7214a50 100644
--- a/index/zserver.c
+++ b/index/zserver.c
@@ -1,4 +1,4 @@
-/* $Id: zserver.c,v 1.94 2002-09-06 19:54:05 adam Exp $
+/* $Id: zserver.c,v 1.97 2002-09-13 11:40:35 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;
     }
@@ -358,7 +358,7 @@ static int es_admin_request (ZebraHandle zh, Z_AdminEsRequest *r)
 	yaz_log(LOG_LOG, "adm-drop");
 	break;
     case Z_ESAdminOriginPartToKeep_create:
-	yaz_log(LOG_LOG, "adm-create");
+	yaz_log(LOG_LOG, "adm-create %s", r->toKeep->databaseName);
 	zebra_admin_create (zh, r->toKeep->databaseName);
 	break;
     case Z_ESAdminOriginPartToKeep_import:
@@ -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,8 +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);