Change our "tty" enablement code to not set sasl_error_logger for now #7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This also changes our setting of `error_logger` to be more robust and to leave `RABBITMQ_SERVER_START_ARGS` as the user-available knob it's supposed to be.
|
LGTM |
yosifkit
added a commit
that referenced
this pull request
Feb 3, 2015
Change our "tty" enablement code to not set sasl_error_logger for now
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Feb 4, 2015
- `django`: 1.7.4 - `haproxy`: 1.4.26 and 1.5.11 - `java`: 6b34 - `mariadb`: resync entrypoint with `mysql` (see `mysql` changes below; MariaDB/mariadb-docker#4) - `mongo`: 3.0.0-rc7 - `mysql`: read `DATADIR` from the MySQL configuration directly (docker-library/mysql#46); 5.5.42 and 5.6.23 - `php`: remove `Indexes` from Apache configuration (docker-library/php#66) - `pypy`: 2-2.5.0 - `rabbitmq`: fix TTY logging enablement (docker-library/rabbitmq#7)
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Feb 4, 2015
- `django`: 1.7.4 - `haproxy`: 1.4.26 and 1.5.11 - `java`: 6b34 - `mariadb`: resync entrypoint with `mysql` (see `mysql` changes below; MariaDB/mariadb-docker#4) - `mongo`: 3.0.0-rc7 - `mysql`: 5.5.42 and 5.6.23; read `DATADIR` from the MySQL configuration directly (docker-library/mysql#46) - `php`: remove `Indexes` from Apache configuration (docker-library/php#66) - `pypy`: 2-2.5.0 - `rabbitmq`: fix TTY logging enablement (docker-library/rabbitmq#7)
| RUN grep -vE '^\s+-rabbit .*error_logger.*' /usr/lib/rabbitmq/lib/rabbitmq_server-*/sbin/rabbitmq-server > /tmp/rabbitmq-server \ | ||
| # get logs to stdout (thanks to http://www.superpumpup.com/docker-rabbitmq-stdout for inspiration) | ||
| # TODO figure out what we'd need to do to add "(sasl_)?" to this sed and have it work ("{"init terminating in do_boot",{rabbit,failure_during_boot,{error,{cannot_log_to_tty,sasl_report_tty_h,not_installed}}}}") | ||
| RUN sed -E 's!^(\s*-rabbit\s+error_logger)\s+\S*!\1 tty!' /usr/lib/rabbitmq/lib/rabbitmq_server-*/sbin/rabbitmq-server > /tmp/rabbitmq-server \ | ||
| && chmod +x /tmp/rabbitmq-server \ | ||
| && mv /tmp/rabbitmq-server /usr/lib/rabbitmq/lib/rabbitmq_server-*/sbin/rabbitmq-server |
There was a problem hiding this comment.
Even better, this could be:
RUN sed -i.bak -E \
-e 's!^(\s*-rabbit\s+error_logger)\s+\S*!\1 tty!' \
-e 's!^(\s*-rabbit\s+sasl_error_logger)\s+\S*!\1 tty!' \
/usr/lib/rabbitmq/lib/rabbitmq_server-*/sbin/rabbitmq-server
and you get to remove the chmod + the mv.
*Please hold for testing. *
There was a problem hiding this comment.
OK the sasl bit still does not work. Sorry for the comment spam (but the -i.bak bit may still be useful.)
There was a problem hiding this comment.
Hopefully #18 leads to us not needing this at all. 😄
I'm not sure why we didn't use -i here initially... Seems like an oversight, so a PR would definitely be 👍! 😇
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This also changes our setting of
error_loggerto be more robust and to leaveRABBITMQ_SERVER_START_ARGSas the user-available knob it's supposed to be.Fixes #2