Skip to content

Alternative approach to addressing #1282 #1284

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

Merged
merged 4 commits into from
Oct 19, 2019
Merged

Alternative approach to addressing #1282 #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2901143
Added as_string() in LogRecord constructor, and updated tests.
vsajip Sep 27, 2019
592a730
Removed as_string() from LogRecord constructor (a bridge too far) but…
vsajip Sep 27, 2019
335b4e3
Updated .gitignore to ignore certain coverage files named like '.cove…
vsajip Sep 27, 2019
85792fd
Added a minor implementation improvement.
vsajip Oct 1, 2019
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*.swp
*.pss
.DS_Store
.coverage
.coverage*
.eggs/
.pytest_cache/
.tox/
Expand Down
6 changes: 3 additions & 3 deletions supervisor/loggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from supervisor.compat import syslog
from supervisor.compat import long
from supervisor.compat import is_text_stream
from supervisor.compat import as_string

class LevelsByName:
CRIT = 50 # messages that probably require immediate user attention
Expand Down Expand Up @@ -288,10 +289,9 @@ def asdict(self):
part1 = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(now))
asctime = '%s,%03d' % (part1, msecs)
levelname = LOG_LEVELS_BY_NUM[self.level]
msg = as_string(self.msg)
if self.kw:
msg = self.msg % self.kw
else:
msg = self.msg
msg = msg % self.kw
self.dictrepr = {'message':msg, 'levelname':levelname,
'asctime':asctime}
return self.dictrepr
Expand Down
5 changes: 4 additions & 1 deletion supervisor/tests/test_loggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,12 @@ def asdict(self):
@mock.patch('syslog.syslog', MockSysLog())
def test_emit_ascii_noerror(self):
handler = self._makeOne()
record = self._makeLogRecord('hello!')
record = self._makeLogRecord(b'hello!')
handler.emit(record)
syslog.syslog.assert_called_with('hello!')
record = self._makeLogRecord('hi!')
handler.emit(record)
syslog.syslog.assert_called_with('hi!')

@mock.patch('syslog.syslog', MockSysLog())
def test_close(self):
Expand Down