add missing tag/program fields for RFC3164

Author: aboehm

SyslogClient.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
-# vim: noexpandtab tabstop=4 shiftwidth=4 fileformat=unix
 # -*- coding: utf-8 -*-
+# vim: noexpandtab tabstop=4 shiftwidth=4 fileformat=unix
 
 # Syslog client (RFC3164, RFC5424) for Python
 #
@@ -83,11 +83,13 @@ def datetime2rfc3339(dt):
 return "%s%s" % (dt.strftime("%Y-%m-%dT%H:%M:%S.%f"), tz)
 
 class SyslogClient:
-def __init__(self, server, port, proto='udp', forceipv4=False, clientname=None):
+def __init__(self, server, port, proto='udp', forceipv4=False, clientname=None, rfc=None, maxMessageLength=1024):
+self.socket = None
 self.server = server
 self.port = port
 self.proto = socket.SOCK_DGRAM
-self.socket = None
+self.rfc = rfc
+self.maxMessageLength = maxMessageLength
 self.forceipv4 = forceipv4
 
 if proto != None:
@@ -144,15 +146,26 @@ def log(self, message, timestamp=None, hostname=None, facility=None, severity=No
 def send(self, messagedata):
 if self.socket != None or self.connect():
 try:
-self.socket.send(messagedata)
-except BrokenPipeError as e:
+if self.maxMessageLength != None:
+self.socket.send(messagedata[:self.maxMessageLength])
+else:
+self.socket.send(messagedata)
+except IOError as e:
 self.close()
 
 class SyslogClientRFC5424(SyslogClient):
 def __init__(self, server, port, proto='udp', forceipv4=False, clientname=None):
-SyslogClient.__init__(self, server, port, proto, forceipv4, clientname)
+SyslogClient.__init__(self,
+server=server,
+port=port,
+proto=proto,
+forceipv4=forceipv4,
+clientname=clientname,
+rfc='5424',
+maxMessageLength=None,
+)
 
-def log(self, message, facility=None, severity=None, timestamp=None, hostname=None, version=1, appname=None, procid=None, msgid=None):
+def log(self, message, facility=None, severity=None, timestamp=None, hostname=None, version=1, program=None, pid=None, msgid=None):
 
 if facility == None:
 facility = FAC_USER
@@ -177,15 +190,15 @@ def log(self, message, facility=None, severity=None, timestamp=None, hostname=No
 else:
 hostname_s = hostname
 
-if appname == None:
+if program == None:
 appname_s = "-" 
 else:
-appname_s = appname
+appname_s = program
 
-if procid == None:
+if pid == None:
 procid_s = "-"
 else:
-procid_s = procid
+procid_s = pid
 
 if msgid == None:
 msgid_s = "-"
@@ -207,9 +220,17 @@ def log(self, message, facility=None, severity=None, timestamp=None, hostname=No
 
 class SyslogClientRFC3164(SyslogClient):
 def __init__(self, server, port, proto='udp', forceipv4=False, clientname=None):
-SyslogClient.__init__(self, server, port, proto, forceipv4, clientname)
+SyslogClient.__init__(self,
+server=server,
+port=port,
+proto=proto,
+forceipv4=forceipv4,
+clientname=clientname,
+rfc='3164',
+maxMessageLength=1024,
+)
 
-def log(self, message, facility=None, severity=None, timestamp=None, hostname=None):
+def log(self, message, facility=None, severity=None, timestamp=None, hostname=None, program="SyslogClient", pid=None):
 if facility == None:
 facility = FAC_USER
 
@@ -233,10 +254,20 @@ def log(self, message, facility=None, severity=None, timestamp=None, hostname=No
 else:
 hostname_s = hostname
 
-d = "<%i>%s %s %s\n" % (
+tag_s = ""
+if tag == None:
+tag_s += "SyslogClient"
+else:
+tag_s += program
+
+if pid != None:
+tag_s += "[%i]" % (pid)
+
+d = "<%i>%s %s %s: %s\n" % (
 pri,
 timestamp_s,
 hostname_s,
+tag_s,
 message
 )
 

tests/SyslogTime.py

@@ -1,12 +1,12 @@
 #!/usr/bin/python3
-# vim: noexpandtab tabstop=4 shiftwidth=4 fileformat=unix
 # -*- coding: utf-8 -*-
+# vim: noexpandtab tabstop=4 shiftwidth=4 fileformat=unix
 
 import sys, datetime, time
 import SyslogClient
 
 def print_help():
-print("%s : {tcp|udp}://<SERVER>:<PORT> [rfc5434|rfc3164]" % (sys.argv[0]))
+print("%s : {tcp|udp}://<SERVER>:<PORT> [rfc5424|rfc3164]" % (sys.argv[0]))
 sys.exit(0)
 
 if __name__ == "__main__":
@@ -26,8 +26,8 @@ def print_help():
 port = int(args2[1])
 
 if len(sys.argv) == 3:
-rfc = sys.argv[2]
-if rfc.upper() != "RFC3164" and rfc != "RFC5424":
+rfc = sys.argv[2].upper()
+if rfc != "RFC3164" and rfc != "RFC5424":
 print_help()
 else:
 rfc = "RFC3164"
@@ -41,7 +41,7 @@ def print_help():
 client = SyslogClient.SyslogClientRFC3164(host, port, proto=proto)
 
 while True:
-client.log(u"the time is %s" % (datetime.datetime.now()), facility=SyslogClient.FAC_SYSLOG, severity=SyslogClient.SEV_DEBUG)
+client.log("the time is %s" % (datetime.datetime.now()), facility=SyslogClient.FAC_SYSLOG, severity=SyslogClient.SEV_DEBUG, program="time", pid=1)
 try:
 time.sleep(1)
 except KeyboardInterrupt as e: