Skip to content

Adds transparent octet counting message framing #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
meschbach wants to merge 2 commits into from
Closed

Adds transparent octet counting message framing #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a92e6d3
Adds framing strategy for octect-counting frames
May 22, 2017
583d964
Fixes mispelling of Octet
May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions syslogssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@
import socket


class NewLineFraming:

def frame( self, message ):
return message + '\n'


class OctetCountingFraming:

def frame( self, message ):
length = len( message )
frame = str( length ) + " " + message
return frame


class SSLSysLogHandler(logging.handlers.SysLogHandler):

# We need to paste all this in because __init__ bitches otherwise
Expand Down Expand Up @@ -97,6 +111,8 @@ class SSLSysLogHandler(logging.handlers.SysLogHandler):
"CRITICAL" : "critical"
}

framing_strategy = NewLineFraming()


def __init__(self, address, certs=None,
facility=LOG_USER):
Expand All @@ -123,16 +139,17 @@ def close(self):


def emit(self, record):
msg = self.format(record) + '\n'
msg = self.format(record)
prio = '<%d>' % self.encodePriority(self.facility,
self.mapPriority(record.levelname))
if type(msg) is unicode:
msg = msg.encode('utf-8')
if codecs:
msg = codecs.BOM_UTF8 + msg
msg = prio + msg
framed_message = self.framing_strategy.frame(msg)
try:
self.socket.write(msg)
self.socket.write( framed_message )
except(KeyboardInterrupt, SystemExit):
raise
except:
Expand All @@ -142,8 +159,9 @@ def emit(self, record):
### Example Usage ###

if __name__ == '__main__':
host = 'logs.papertrailapp.com'
port = 514 # default, you'll want to change this
import os
host = os.getenv( 'SYSLOG_HOST', 'logs.papertrailapp.com' )
port = int( os.getenv( 'SYSLOG_PORT', '514' ) ) # default, you'll want to change this
address = (host, port)

# We don't want this to hang
Expand Down