Skip to content

Commit 20ffda4

Browse files
committed
Eliminate the need to use patched LogentriesHandler from PR
that is outstanding since 2017. LogentriesCommunity/le_python#61
1 parent 39b7550 commit 20ffda4

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

selfdrive/logmessaged.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def main():
2727
if levelnum >= le_level:
2828
# push to logentries
2929
# TODO: push to athena instead
30-
le_handler.emit_raw(dat)
30+
le_handler.emit(dat)
3131

3232
# then we publish them
3333
msg = messaging.new_message()

selfdrive/swaglog.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66

77
from common.logging_extra import SwagLogger, SwagFormatter
88

9+
class snostrip(str):
10+
def rstrip(self, *args):
11+
return self
12+
13+
class OPLogentriesHandler(LogentriesHandler):
14+
def format(self, record):
15+
r = LogentriesHandler.format(self, record)
16+
return snostrip(r)
917

1018
def get_le_handler():
1119
# setup logentries. we forward log messages to it
1220
le_token = "e8549616-0798-4d7e-a2ca-2513ae81fa17"
13-
return LogentriesHandler(le_token, use_tls=False, verbose=False)
21+
return OPLogentriesHandler(le_token, use_tls=False, verbose=False)
1422

1523

1624
class LogMessageHandler(logging.Handler):

0 commit comments

Comments
 (0)