Skip to content
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

Jump to bottom

Remove separate config for island logger #1151

Merged
merged 20 commits into from
May 11, 2021
Merged

Remove separate config for island logger #1151

merged 20 commits into from
May 11, 2021

Commits on May 10, 2021

  1. Remove `island_logger_config.json\'

    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    5bcd917 View commit details
    Browse the repository at this point in the history

  2. Remove --logger-config command-line argument, add "log_level" to se… 

    …rver_config.json
    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    ab89590 View commit details
    Browse the repository at this point in the history

  3. Replace json_setup_logging() with setup_logging() to configure lo… 

    …gger
    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    785f2ef View commit details
    Browse the repository at this point in the history

  4. Set log filename in config before expanding its paths

    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    f84e4ae View commit details
    Browse the repository at this point in the history

  5. Fix unit tests and modify code based on failed tests (tests/monkey_is… 

    …land/cc/server_utils/test_island_logger.py)
    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    6d04e7c View commit details
    Browse the repository at this point in the history

  6. Update CHANGELOG.md (removed island logger config)

    @shreyamalviya
    shreyamalviya committed May 10, 2021
    Configuration menu
    Copy the full SHA
    0556465 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Assume configured data directory exists when configuring the logger

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    8dc84ee View commit details
    Browse the repository at this point in the history

  2. Remove "__author__" field

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    805ab98 View commit details
    Browse the repository at this point in the history

  3. Catch and print errors instead of creating a default server config

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    3c7687a View commit details
    Browse the repository at this point in the history

  4. Move DEFAULT_LOG_LEVEL and add function load_server_config to mon… 

    …key_island.py
    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    e8c1c81 View commit details
    Browse the repository at this point in the history

  5. Modify/add unit tests (test_island_logger.py)

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    c5ba48d View commit details
    Browse the repository at this point in the history

  6. Add tests for console logging (test_island_logger.py)

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    5f8145e View commit details
    Browse the repository at this point in the history

  7. Rename unit test functions in test_island_logger.py

    @shreyamalviya
    shreyamalviya committed May 11, 2021
    Configuration menu
    Copy the full SHA
    83a235b View commit details
    Browse the repository at this point in the history

  8. island: Move load_server_config() to config_loader.py 

    Because `monkey_island.py` has the same name as the `monkey_island`
module, pytest can't import monkey_island.py and run any tests against
its code.
    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    f7bef76 View commit details
    Browse the repository at this point in the history

  9. island: Add unit test for load_server_config()

    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    5847674 View commit details
    Browse the repository at this point in the history

  10. island: Return config dict from load_server_config() 

    As the number of configuration items will increase in the future, return
the config dict instead of individual config properties.
    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    990244c View commit details
    Browse the repository at this point in the history

  11. island: Add tests for default server config values

    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    de7865a View commit details
    Browse the repository at this point in the history

  12. island: Simplify logic in add_default_values_to_config()

    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    5ea241f View commit details
    Browse the repository at this point in the history

  13. island: Handle lower case log levels in server config

    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    08668f3 View commit details
    Browse the repository at this point in the history

  14. island: Add debug log level to server_config.json.develop

    @mssalvatore
    mssalvatore committed May 11, 2021
    Configuration menu
    Copy the full SHA
    b13839d View commit details
    Browse the repository at this point in the history