Skip to content
Draft
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5c94a69
Adding plaintext and JSON logging formatters
Alsheh Apr 20, 2021
88b3804
putting formatter creation logic in a class
Alsheh Apr 20, 2021
489ffa3
Merge pull request #1 from Alsheh/logformat-formatter-factory
Alsheh Apr 20, 2021
62ace15
Adding the ability to add default values for required fields in the l…
Alsheh Apr 21, 2021
67c6c7f
Avoid overwriting record fields with default values.
Alsheh Apr 21, 2021
6bedd36
Merge pull request #2 from Alsheh/logformat-default-value-parser
Alsheh Apr 21, 2021
5f1b906
Adding the only supervisor dependency: python-json-logger
Alsheh Apr 21, 2021
407b37f
Merge pull request #3 from Alsheh/logging-formatters-dependency
Alsheh Apr 21, 2021
45803b7
Adding log attributes to DummyPConfig object
Alsheh Apr 21, 2021
cee1eb0
Merge pull request #4 from Alsheh/logging-formatters-ci-test
Alsheh Apr 21, 2021
30ab58f
Adding logging formatters options tests
Alsheh Apr 21, 2021
f8e4f93
Adding the ability to set level by description
Alsheh Apr 21, 2021
5853312
Merge pull request #6 from Alsheh/logging-formatters-local
Alsheh Apr 21, 2021
f52b2e2
Adding the ability to set level by number
Alsheh Apr 21, 2021
01dfa8d
Merge pull request #7 from Alsheh/logging-formatters-local
Alsheh Apr 21, 2021
646f19d
Reverting commit f52b2e2fa518f1e0df9272dc7d21bba55d06a207
Alsheh Apr 21, 2021
a3bb1d1
Removing unintended unit testing
Alsheh Apr 21, 2021
c2654e8
Merge pull request #8 from Alsheh/logging-formatters-local
Alsheh Apr 22, 2021
771e101
Fxing a typo
Alsheh Apr 22, 2021
9fbe7e6
Using for/else for simplicity
Alsheh Apr 22, 2021
29fcd9a
Refactoring formatters factory conditionals
Alsheh Apr 22, 2021
1f59e79
Removing duplicate code
Alsheh Apr 22, 2021
618b16b
Code restructuring and CI tests updates
Alsheh Apr 28, 2021
e2c1d80
Merge pull request #9 from Alsheh/logging-formatters-local
Alsheh Apr 28, 2021
959c928
Making the logger backward compatible
Alsheh Apr 28, 2021
ae76fb3
Merge pull request #10 from Alsheh/logging-formatters-local
Alsheh Apr 28, 2021
b573bd3
Removing jsonformatter dependency
Alsheh Apr 29, 2021
871b55a
Merge pull request #11 from Alsheh/logging-formatters-local
Alsheh Apr 29, 2021
b9cde7d
loggers updates
Alsheh Apr 29, 2021
2a50bb3
Merge pull request #14 from Alsheh/logging-formatters-local
Alsheh Apr 29, 2021
5736268
Fixing an issue where numbers are considered valid JSON by the praser
Alsheh May 4, 2021
b623852
Merge pull request #17 from Alsheh/logging-formatters-local
Alsheh May 5, 2021
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
Prev Previous commit
Next Next commit
Adding logging formatters options tests
  • Loading branch information
Alsheh committed Apr 21, 2021
commit 30ab58f5622ad94a471a408fe3733368e2965322
13 changes: 13 additions & 0 deletions supervisor/tests/test_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@ def test_options(self):
logfile_maxbytes=1000MB
logfile_backups=5
loglevel=error
logformat={message}
logformatter=plaintext
pidfile=supervisord.pid
nodaemon=true
silent=true
Expand Down Expand Up @@ -492,6 +494,9 @@ def test_options(self):
startretries=10
directory=/tmp
umask=002
loglevel=error
logformat={message}
logformatter=plaintext

[program:cat2]
priority=2
Expand Down Expand Up @@ -540,6 +545,8 @@ def test_options(self):
self.assertEqual(options.logfile_maxbytes, 1000 * 1024 * 1024)
self.assertEqual(options.logfile_backups, 5)
self.assertEqual(options.loglevel, 40)
self.assertEqual(options.logformat, '{message}')
self.assertEqual(options.logformatter, 'plaintext')
self.assertEqual(options.pidfile, 'supervisord.pid')
self.assertEqual(options.nodaemon, True)
self.assertEqual(options.silent, True)
Expand Down Expand Up @@ -583,6 +590,9 @@ def test_options(self):
self.assertEqual(proc1.exitcodes, [0])
self.assertEqual(proc1.directory, '/tmp')
self.assertEqual(proc1.umask, 2)
self.assertEqual(proc1.loglevel, 40)
self.assertEqual(proc1.logformat, '{message}')
self.assertEqual(proc1.logformatter, 'plaintext')
self.assertEqual(proc1.environment, dict(FAKE_ENV_VAR='/some/path'))

cat2 = options.process_group_configs[1]
Expand All @@ -605,6 +615,9 @@ def test_options(self):
self.assertEqual(proc2.stdout_logfile_backups, 2)
self.assertEqual(proc2.exitcodes, [0])
self.assertEqual(proc2.directory, None)
self.assertEqual(proc2.loglevel, 40)
self.assertEqual(proc2.logformat, '{message}')
self.assertEqual(proc2.logformatter, 'plaintext')

cat3 = options.process_group_configs[2]
self.assertEqual(cat3.name, 'cat3')
Expand Down