From 4c24ac8f8a4e3939cbc5b5f6d5fb5032fdba50d9 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Sat, 28 Jul 2012 13:17:55 -0400 Subject: [PATCH] vlserver: use the logging function to log Use the logging function to log instead of printf. Change-Id: I377474881830152c93122bd3112e355ab5fd56ad Reviewed-on: http://gerrit.openafs.org/7895 Tested-by: BuildBot Reviewed-by: Alistair Ferguson Reviewed-by: Derrick Brashear (cherry picked from commit beb8f07496f59a19621bb0db14b401107888de35) Change-Id: I246610abc3a6c2e164e0f368bc75a671f5f52e4d Reviewed-on: http://gerrit.openafs.org/8208 Reviewed-by: Andrew Deason Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/vlserver/vlserver.c | 14 +++++++------- src/vlserver/vlutils.c | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c index ef51860e5..1eeae562c 100644 --- a/src/vlserver/vlserver.c +++ b/src/vlserver/vlserver.c @@ -279,16 +279,16 @@ main(int argc, char **argv) tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH); if (!tdir) { - printf + VLog(0, ("vlserver: can't open configuration files in dir %s, giving up.\n", - AFSDIR_SERVER_ETC_DIRPATH); + AFSDIR_SERVER_ETC_DIRPATH)); exit(1); } #ifdef AFS_NT40_ENV /* initialize winsock */ if (afs_winsockInit() < 0) { ReportErrorEventAlt(AFSEVT_SVR_WINSOCK_INIT_FAILED, 0, argv[0], 0); - fprintf(stderr, "vlserver: couldn't initialize winsock. \n"); + VLog(0, ("vlserver: couldn't initialize winsock.\n")); exit(1); } #endif @@ -296,8 +296,8 @@ main(int argc, char **argv) gethostname(hostname, sizeof(hostname)); th = gethostbyname(hostname); if (!th) { - printf("vlserver: couldn't get address of this host (%s).\n", - hostname); + VLog(0, ("vlserver: couldn't get address of this host (%s).\n", + hostname)); exit(1); } memcpy(&myHost, th->h_addr, sizeof(afs_uint32)); @@ -310,7 +310,7 @@ main(int argc, char **argv) afsconf_GetExtendedCellInfo(tdir, NULL, AFSCONF_VLDBSERVICE, &info, clones); if (code) { - printf("vlserver: Couldn't get cell server list for 'afsvldb'.\n"); + VLog(0, ("vlserver: Couldn't get cell server list for 'afsvldb'.\n")); exit(2); } @@ -392,7 +392,7 @@ main(int argc, char **argv) securityClasses, numClasses, RXSTATS_ExecuteRequest); if (tservice == (struct rx_service *)0) { - printf("vlserver: Could not create rpc stats rx service\n"); + VLog(0, ("vlserver: Could not create rpc stats rx service\n")); exit(3); } rx_SetMinProcs(tservice, 2); diff --git a/src/vlserver/vlutils.c b/src/vlserver/vlutils.c index 18c051d2f..4ab247844 100644 --- a/src/vlserver/vlutils.c +++ b/src/vlserver/vlutils.c @@ -329,7 +329,7 @@ UpdateCache(struct ubik_trans *trans, void *rock) /* now, if can't read, or header is wrong, write a new header */ if (ubcode || vldbversion == 0) { if (builddb) { - printf("Can't read VLDB header, re-initialising...\n"); + VLog(0, ("Can't read VLDB header, re-initialising...\n")); /* try to write a good header */ memset(&cheader, 0, sizeof(cheader)); @@ -344,7 +344,7 @@ UpdateCache(struct ubik_trans *trans, void *rock) } code = vlwrite(trans, 0, (char *)&cheader, sizeof(cheader)); if (code) { - printf("Can't write VLDB header (error = %d)\n", code); + VLog(0, ("Can't write VLDB header (error = %d)\n", code)); ERROR_EXIT(VL_IO); } vldbversion = ntohl(cheader.vital_header.vldbversion); @@ -355,9 +355,9 @@ UpdateCache(struct ubik_trans *trans, void *rock) if ((vldbversion != VLDBVERSION) && (vldbversion != OVLDBVERSION) && (vldbversion != VLDBVERSION_4)) { - printf + VLog(0, ("VLDB version %d doesn't match this software version(%d, %d or %d), quitting!\n", - vldbversion, VLDBVERSION_4, VLDBVERSION, OVLDBVERSION); + vldbversion, VLDBVERSION_4, VLDBVERSION, OVLDBVERSION)); return VL_BADVERSION; } -- 2.39.5