From e011b31bfa2a511ef663a85ffd548e64303a4c3c Mon Sep 17 00:00:00 2001
From: Jeffrey Hutzelman <jhutz@cmu.edu>
Date: Thu, 29 May 2003 19:03:14 +0000
Subject: [PATCH] syslog-tags-20030515

FIXES 1266

include a program tag in syslog output
---
 src/ptserver/ptserver.c | 1 +
 src/util/afsutil.h      | 1 +
 src/util/serverLog.c    | 3 ++-
 src/viced/viced.c       | 1 +
 src/vlserver/vlserver.c | 1 +
 src/vol/vol-salvage.c   | 2 +-
 6 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c
index 8ab574a10..aed20e8a0 100644
--- a/src/ptserver/ptserver.c
+++ b/src/ptserver/ptserver.c
@@ -327,6 +327,7 @@ void main (argc, argv)
 #endif
     }
 
+    serverLogSyslogTag = "ptserver";
     OpenLog(AFSDIR_SERVER_PTLOG_FILEPATH);     /* set up logging */
     SetupLogSignals();
  
diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index b5d5b4c5d..2438ea672 100644
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -28,6 +28,7 @@ extern int LogLevel;
 #ifndef AFS_NT40_ENV
 extern int serverLogSyslog;
 extern int serverLogSyslogFacility;
+extern char *serverLogSyslogTag;
 #endif
 extern void FSLog(const char *format, ...);
 #define ViceLog(level, str)  if ((level) <= LogLevel) (FSLog str)
diff --git a/src/util/serverLog.c b/src/util/serverLog.c
index f9757dc46..5f9cc8ccb 100644
--- a/src/util/serverLog.c
+++ b/src/util/serverLog.c
@@ -74,6 +74,7 @@ static int serverLogFD = -1;
 #ifndef AFS_NT40_ENV
 int serverLogSyslog = 0;
 int serverLogSyslogFacility = LOG_DAEMON;
+char *serverLogSyslogTag = 0;
 #endif
 
 #include <stdarg.h>
@@ -208,7 +209,7 @@ int OpenLog(const char *fileName)
 
 #ifndef AFS_NT40_ENV
     if ( serverLogSyslog ) {
-	openlog(NULL, LOG_PID, serverLogSyslogFacility);
+	openlog(serverLogSyslogTag, LOG_PID, serverLogSyslogFacility);
 	return(0);
     }
 #endif
diff --git a/src/viced/viced.c b/src/viced/viced.c
index c3a378363..7eb51d227 100644
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -1418,6 +1418,7 @@ main(int argc, char * argv[])
     NewParms(1);
 
     /* Open FileLog on stdout, stderr, fd 1 and fd2 (for perror), sigh. */
+    serverLogSyslogTag = "fileserver";
     OpenLog(AFSDIR_SERVER_FILELOG_FILEPATH);
     SetupLogSignals(); 
 
diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index f2c02ec52..88e93ca90 100644
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -213,6 +213,7 @@ char	**argv;
     } 
     vl_dbaseName = AFSDIR_SERVER_VLDB_FILEPATH;
 
+    serverLogSyslogTag = "vlserver";
     OpenLog(AFSDIR_SERVER_VLOG_FILEPATH);   /* set up logging */
     SetupLogSignals(); 
 
diff --git a/src/vol/vol-salvage.c b/src/vol/vol-salvage.c
index cd1068e71..9d894a895 100644
--- a/src/vol/vol-salvage.c
+++ b/src/vol/vol-salvage.c
@@ -1066,7 +1066,7 @@ void SalvageFileSysParallel(struct DiskPartition *partP)
 	     open("/", 0); dup2(0, 1); dup2(0, 2);
 #ifndef AFS_NT40_ENV
 		 if ( useSyslog ) {
-		 	openlog(NULL, LOG_PID, useSyslogFacility);
+		 	openlog("salvager", LOG_PID, useSyslogFacility);
 		 } else
 #endif
 		 {
-- 
2.39.5